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

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2023-07-07 06:01:26 +00:00 committed by GitHub
parent c0f0122ec5 c63bad1618
commit cdb00fdc73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 149 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkgs/applications/emulators/fs-uae/default.nix
View file

@ -17,15 +17,14 @@
, zlib
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs:{
pname = "fs-uae";
version = "3.1.66";
src = fetchFromGitHub {
owner = "FrodeSolheim";
repo = pname;
rev = "v${version}";
repo = "fs-uae";
rev = "v${finalAttrs.version}";
hash = "sha256-zPVRPazelmNaxcoCStB0j9b9qwQDTgv3O7Bg3VlW9ys=";
};
@ -49,17 +48,17 @@ stdenv.mkDerivation rec {
zlib
];
meta = with lib; {
meta = {
homepage = "https://fs-uae.net";
description = "An accurate, customizable Amiga Emulator";
longDescription = ''
FS-UAE integrates the most accurate Amiga emulation code available
from WinUAE. FS-UAE emulates A500, A500+, A600, A1200, A1000, A3000
and A4000 models, but you can tweak the hardware configuration and
create customized Amigas.
FS-UAE integrates the most accurate Amiga emulation code available from
WinUAE. FS-UAE emulates A500, A500+, A600, A1200, A1000, A3000 and A4000
models, but you can tweak the hardware configuration and create customized
Amigas.
'';
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres ];
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}
})

21
pkgs/applications/emulators/fs-uae/launcher.nix
View file

@ -7,13 +7,13 @@
, fsuae
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "fs-uae-launcher";
version = "3.0.5";
version = "3.1.68";
src = fetchurl {
url = "https://fs-uae.net/stable/${version}/${pname}-${version}.tar.gz";
sha256 = "1dknra4ngz7bpppwqghmza1q68pn1yaw54p9ba0f42zwp427ly97";
url = "https://fs-uae.net/files/FS-UAE-Launcher/Stable/${finalAttrs.version}/fs-uae-launcher-${finalAttrs.version}.tar.xz";
hash = "sha256-42EERC2yeODx0HPbwr4vmpN80z6WSWi3WzJMOT+OwDA=";
};
nativeBuildInputs = [
@ -33,16 +33,17 @@ stdenv.mkDerivation rec {
dontWrapQtApps = true;
preFixup = ''
wrapQtApp "$out/bin/fs-uae-launcher" --set PYTHONPATH "$PYTHONPATH" \
--prefix PATH : ${lib.makeBinPath [ fsuae ]}
wrapQtApp "$out/bin/fs-uae-launcher" \
--set PYTHONPATH "$PYTHONPATH" \
--prefix PATH : ${lib.makeBinPath [ fsuae ]}
'';
meta = with lib; {
meta = {
homepage = "https://fs-uae.net";
description = "Graphical front-end for the FS-UAE emulator";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ sander AndersonTorres ];
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ sander AndersonTorres ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}
})

28
pkgs/applications/networking/cluster/terraform-providers/providers.json
View file

@ -110,13 +110,13 @@
"vendorHash": null
},
"aws": {
"hash": "sha256-ZKP0Y65GgOxF9IIPR9YIkpm7+fanNuvWPKNBk8XY0ec=",
"hash": "sha256-LFOlSmsnV7opt9Z3b15Lyi8sFYjx2WkvvB8vpJBjfWQ=",
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
"owner": "hashicorp",
"repo": "terraform-provider-aws",
"rev": "v5.6.2",
"rev": "v5.7.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-ucMaOdELGc71QDlEa3lYJU3HkmE85XFHgWBUT+Ds3EM="
"vendorHash": "sha256-x8f1sTVB1FaoPKgTGEoZaNVKCpNbTrQ7F0PVfwEWe/I="
},
"azuread": {
"hash": "sha256-wBNS2a6O1QJgssbAWhSRSfxaVZ35zgT/qNdpE++NQ8U=",
@ -128,11 +128,11 @@
"vendorHash": null
},
"azurerm": {
"hash": "sha256-iZg9iTmomNmk8K1gPfXZNiesJPuKyjfBdTyoeV7qBdo=",
"hash": "sha256-PwAwVpLoMq5DNIiY5wt+n9oqNGInJ+C0JfiFagtrAEA=",
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
"owner": "hashicorp",
"repo": "terraform-provider-azurerm",
"rev": "v3.63.0",
"rev": "v3.64.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -445,22 +445,22 @@
"vendorHash": "sha256-XgGNz+yP+spRA2+qFxwiZFcBRv2GQWhiYY9zoC8rZPc="
},
"google": {
"hash": "sha256-Mg4pB5FaphdPYBqev+KvNp0gucL8Oj8NDCh4Dk4B/jY=",
"hash": "sha256-ZOouPBEymdpVaDe1zBwbbeffZ/48lpfLmll6kl1TnJM=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v4.72.0",
"rev": "v4.72.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-X+7UZM0iZzG7LvaK6nKXF3taKIiJfhWRmY1q1Uz9M4A="
},
"google-beta": {
"hash": "sha256-OF/7WiSkXkBqDC9dd8aN0YrIyC2YxevkUPCT8ftZ0b8=",
"hash": "sha256-wXBSAsRY1RajMu5npceI9N/c+c2lwEWyqsGP7xgfVA0=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
"rev": "v4.72.0",
"rev": "v4.72.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-X+7UZM0iZzG7LvaK6nKXF3taKIiJfhWRmY1q1Uz9M4A="
},
@ -818,22 +818,22 @@
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
},
"oci": {
"hash": "sha256-kIZrfTwni3l2x9/W6efESz+4raU8bERD33N9H3f6Zbc=",
"hash": "sha256-58B09Oo276Eu7Rf34T1iGcmK7jF3c1yvUegyP2rQtqg=",
"homepage": "https://registry.terraform.io/providers/oracle/oci",
"owner": "oracle",
"repo": "terraform-provider-oci",
"rev": "v5.2.1",
"rev": "v5.3.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
"okta": {
"hash": "sha256-yWi3Bp/fBizvb3k9nT72N5AjvLTUK1szXetwWUrqqlw=",
"hash": "sha256-cNVHEZPUkpruM7EDrriKeefzsHhwC+vyadTztRyGCFA=",
"homepage": "https://registry.terraform.io/providers/okta/okta",
"owner": "okta",
"repo": "terraform-provider-okta",
"rev": "v4.0.2",
"rev": "v4.1.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-34mm1OjdJRMmMvV8OX96BidzW20RSKnOWmZbSRfNFlQ="
"vendorHash": "sha256-0KB2L7L6EWN2VMsTKXtWElzBRfmny+JjarhhzZtWxtA="
},
"oktaasa": {
"hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=",

5
pkgs/applications/networking/mailreaders/mutt/default.nix
View file

@ -31,7 +31,10 @@ stdenv.mkDerivation rec {
sha256 = "sha256-TXc/IkIveQlve5S1e+5FZUrZolFl27NkY8WClbTNPYg=";
};
patches = lib.optional smimeSupport (fetchpatch {
patches = [
# Avoid build-only references embedding into 'mutt -v' output.
./no-build-only-refs.patch
] ++ lib.optional smimeSupport (fetchpatch {
url = "https://salsa.debian.org/mutt-team/mutt/raw/debian/1.10.1-2/debian/patches/misc/smime.rc.patch";
sha256 = "0b4i00chvx6zj9pcb06x2jysmrcb2znn831lcy32cgfds6gr3nsi";
});

24
pkgs/applications/networking/mailreaders/mutt/no-build-only-refs.patch Normal file
View file

@ -0,0 +1,24 @@
Avoid build-only store references embedding into 'mutt -v'.
--- a/txt2c.sh
+++ b/txt2c.sh
@@ -21,8 +21,18 @@ txt2c_fallback () {
echo ";"
}
+nix_store_mangle() {
+ # consume stdin
+
+ # Avoid build-only references to nix store. These are usually
+ # 'gcc -v' output embedded into 'mutt -v'. But also might be
+ # ./configure-passed arguments.
+ sed \
+ -e 's@'$NIX_STORE'/[a-z0-9]\{32\}-@/<<NIX>>/@g'
+}
+
if ./txt2c test </dev/null >/dev/null 2>&1; then
- ./txt2c "$1"
+ nix_store_mangle | ./txt2c "$1"
else
- txt2c_fallback "$1"
+ nix_store_mangle | txt2c_fallback "$1"
fi

23
pkgs/applications/video/smplayer/default.nix
View file

@ -6,15 +6,15 @@
, wrapQtAppsHook
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "smplayer";
version = "22.7.0";
version = "23.6.0";
src = fetchFromGitHub {
owner = "smplayer-dev";
repo = pname;
rev = "v${version}";
hash = "sha256-vU+M5aCCGSA+IwJXTLMYvno/Qei+5Hwck3Q/Ah7N09s=";
repo = "smplayer";
rev = "v${finalAttrs.version}";
hash = "sha256-xGy6/9aUftBTSo9HJ3zyuRSagqimP9XvXKP/4oBQTo4=";
};
nativeBuildInputs = [
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
"PREFIX=${placeholder "out"}"
];
meta = with lib; {
meta = {
homepage = "https://www.smplayer.info";
description = "A complete front-end for MPlayer";
longDescription = ''
@ -53,9 +53,10 @@ stdenv.mkDerivation rec {
options of MPlayer, SMPlayer adds other interesting features like the
possibility to play Youtube videos or download subtitles.
'';
license = licenses.gpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.linux;
changelog = "https://github.com/smplayer-dev/smplayer/releases/tag/v${finalAttrs.version}";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.linux;
};
}
# TODO [ AndersonTorres ]: some form of wrapping mplayer/mpv around it
})
# TODO [ AndersonTorres ]: create a wrapper including mplayer/mpv

4
pkgs/development/libraries/nix-plugins/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "nix-plugins";
version = "10.0.0";
version = "11.0.0";
src = fetchFromGitHub {
owner = "shlevy";
repo = "nix-plugins";
rev = version;
hash = "sha256-7Lo+YxpiRz0+ZLFDvYMJWWK2j0CyPDRoP1wAc+OaPJY=";
hash = "sha256-sJL8g+UVFvJTqujS9F6gy8tairYUztHCSILkQlwDADU";
};
nativeBuildInputs = [ cmake pkg-config ];

5
pkgs/development/ruby-modules/bundled-common/default.nix
View file

@ -56,9 +56,9 @@ let
else
let
gem = gems.${pname};
version = gem.version;
suffix = gem.suffix;
in
"${pname}-${version}";
"${pname}-${suffix}";
pname' = if pname != null then
pname
@ -118,6 +118,7 @@ let
passthru = rec {
inherit ruby bundler gems confFiles envPaths;
inherit (gems.${pname}) gemType;
wrappedRuby = stdenv.mkDerivation {
name = "wrapped-ruby-${pname'}";

5
pkgs/development/ruby-modules/bundler-app/default.nix
View file

@ -68,7 +68,10 @@ in
${lib.optionalString installManpages ''
for section in {1..9}; do
mandir="$out/share/man/man$section"
find -L ${basicEnv}/${ruby.gemPath}/gems/${basicEnv.name} \( -wholename "*/man/*.$section" -o -wholename "*/man/man$section/*.$section" \) -print -execdir mkdir -p $mandir \; -execdir cp '{}' $mandir \;
# See: https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/ruby-modules/gem/default.nix#L184-L200
# See: https://github.com/rubygems/rubygems/blob/7a7b234721c375874b7e22b1c5b14925b943f04e/bundler/lib/bundler.rb#L285-L291
find -L ${basicEnv}/${ruby.gemPath}/${lib.optionalString (basicEnv.gemType == "git" || basicEnv.gemType == "url") "bundler/"}gems/${basicEnv.name} \( -wholename "*/man/*.$section" -o -wholename "*/man/man$section/*.$section" \) -print -execdir mkdir -p $mandir \; -execdir cp '{}' $mandir \;
done
''}
''

11
pkgs/development/ruby-modules/gem/default.nix
View file

@ -75,6 +75,14 @@ let
else
throw "buildRubyGem: don't know how to build a gem of type \"${type}\""
);
# See: https://github.com/rubygems/rubygems/blob/7a7b234721c375874b7e22b1c5b14925b943f04e/bundler/lib/bundler/source/git.rb#L103
suffix =
if type == "git" then
builtins.substring 0 12 attrs.source.rev
else
version;
documentFlag =
if document == []
then "-N"
@ -86,6 +94,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // {
inherit ruby;
inherit dontBuild;
inherit dontStrip;
inherit suffix;
gemType = type;
nativeBuildInputs = [
@ -100,7 +109,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // {
++ buildInputs;
#name = builtins.trace (attrs.name or "no attr.name" ) "${namePrefix}${gemName}-${version}";
name = attrs.name or "${namePrefix}${gemName}-${version}";
name = attrs.name or "${namePrefix}${gemName}-${suffix}";
inherit src;

72
pkgs/development/tools/language-servers/millet/Cargo.lock generated
View file

@ -28,7 +28,7 @@ dependencies = [
[[package]]
name = "analysis"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"config",
"diagnostic",
@ -108,7 +108,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chain-map"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"fast-hash",
"str-util",
@ -121,7 +121,7 @@ source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e
[[package]]
name = "cm-syntax"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"lex-util",
"paths",
@ -150,7 +150,7 @@ dependencies = [
[[package]]
name = "config"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"fast-hash",
"serde",
@ -178,7 +178,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636"
[[package]]
name = "cov-mark"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"fast-hash",
"once_cell",
@ -415,7 +415,7 @@ dependencies = [
[[package]]
name = "input"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"cm-syntax",
"config",
@ -475,7 +475,7 @@ checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306"
[[package]]
name = "lang-srv"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"analysis",
"anyhow",
@ -503,7 +503,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "lex-util"
version = "0.12.2"
version = "0.12.4"
[[package]]
name = "libc"
@ -575,7 +575,7 @@ dependencies = [
[[package]]
name = "millet-cli"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"analysis",
"codespan-reporting",
@ -593,7 +593,7 @@ dependencies = [
[[package]]
name = "millet-ls"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"anyhow",
"env_logger",
@ -622,7 +622,7 @@ dependencies = [
[[package]]
name = "mlb-hir"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"fast-hash",
"paths",
@ -633,7 +633,7 @@ dependencies = [
[[package]]
name = "mlb-statics"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"config",
"diagnostic",
@ -657,7 +657,7 @@ dependencies = [
[[package]]
name = "mlb-syntax"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"lex-util",
"paths",
@ -729,7 +729,7 @@ dependencies = [
[[package]]
name = "panic-hook"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"better-panic",
]
@ -923,7 +923,7 @@ dependencies = [
[[package]]
name = "slash-var-path"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"fast-hash",
"str-util",
@ -931,14 +931,14 @@ dependencies = [
[[package]]
name = "sml-comment"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"sml-syntax",
]
[[package]]
name = "sml-dynamics"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"fast-hash",
"fmt-util",
@ -949,7 +949,7 @@ dependencies = [
[[package]]
name = "sml-dynamics-tests"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"config",
"pretty_assertions",
@ -965,7 +965,7 @@ dependencies = [
[[package]]
name = "sml-file-syntax"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"config",
"elapsed",
@ -979,7 +979,7 @@ dependencies = [
[[package]]
name = "sml-fixity"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"fast-hash",
"once_cell",
@ -988,7 +988,7 @@ dependencies = [
[[package]]
name = "sml-hir"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"la-arena",
"sml-lab",
@ -999,7 +999,7 @@ dependencies = [
[[package]]
name = "sml-hir-lower"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"config",
"cov-mark",
@ -1014,14 +1014,14 @@ dependencies = [
[[package]]
name = "sml-lab"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"str-util",
]
[[package]]
name = "sml-lex"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"cov-mark",
"diagnostic",
@ -1036,7 +1036,7 @@ source = "git+https://github.com/azdavis/sml-libs.git#3948485e5bf5649e50271caf3e
[[package]]
name = "sml-naive-fmt"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"fast-hash",
"sml-comment",
@ -1045,11 +1045,11 @@ dependencies = [
[[package]]
name = "sml-namespace"
version = "0.12.2"
version = "0.12.4"
[[package]]
name = "sml-parse"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"diagnostic",
"event-parse",
@ -1061,14 +1061,14 @@ dependencies = [
[[package]]
name = "sml-path"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"str-util",
]
[[package]]
name = "sml-scon"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"num-bigint",
"num-traits",
@ -1077,7 +1077,7 @@ dependencies = [
[[package]]
name = "sml-statics"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"chain-map",
"config",
@ -1100,7 +1100,7 @@ dependencies = [
[[package]]
name = "sml-statics-types"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"chain-map",
"code-h2-md-map",
@ -1119,7 +1119,7 @@ dependencies = [
[[package]]
name = "sml-symbol-kind"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"sml-namespace",
"sml-statics-types",
@ -1127,7 +1127,7 @@ dependencies = [
[[package]]
name = "sml-syntax"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"char-name",
"code-h2-md-map",
@ -1140,7 +1140,7 @@ dependencies = [
[[package]]
name = "sml-ty-var-scope"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"fast-hash",
"sml-hir",
@ -1208,7 +1208,7 @@ dependencies = [
[[package]]
name = "tests"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"analysis",
"cm-syntax",
@ -1552,7 +1552,7 @@ dependencies = [
[[package]]
name = "xtask"
version = "0.12.2"
version = "0.12.4"
dependencies = [
"anyhow",
"flate2",

4
pkgs/development/tools/language-servers/millet/default.nix
View file

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "millet";
version = "0.12.2";
version = "0.12.4";
src = fetchFromGitHub {
owner = "azdavis";
repo = pname;
rev = "v${version}";
hash = "sha256-qfBDwbAbj4XoZeH0hyS09iUfg0G1X1RjpVOSd+2twT0=";
hash = "sha256-RSi6rJL0RG1A1mKn4BznQjBfPlBvEC73vx0YevqvZ3E=";
};
cargoLock = {

4
pkgs/servers/home-automation/evcc/default.nix
View file

@ -16,13 +16,13 @@
buildGoModule rec {
pname = "evcc";
version = "0.118.2";
version = "0.118.6";
src = fetchFromGitHub {
owner = "evcc-io";
repo = pname;
rev = version;
hash = "sha256-4zbXNXNWrnsghbL2cvatCShuio7uIXbLtLmG0o4PGq0=";
hash = "sha256-4AJTXLH17D4AMmNus341VHu9bHAkosOaA7DIw9gbYOM=";
};
vendorHash = "sha256-SFs7Bua3/bgTcdzvSisTn3Xx+7jD84LrMdaUhDXp9VI=";

8
pkgs/tools/cd-dvd/ventoy/default.nix
View file

@ -186,7 +186,7 @@ stdenv.mkDerivation (finalAttrs: {
runHook postInstall
'';
meta = with lib; {
meta = {
homepage = "https://www.ventoy.net";
description = "A New Bootable USB Solution";
longDescription = ''
@ -203,9 +203,9 @@ stdenv.mkDerivation (finalAttrs: {
800+ image files are tested. 90%+ distros in DistroWatch supported.
'';
changelog = "https://www.ventoy.net/doc_news.html";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "mipsel-linux" ];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
})

16
pkgs/tools/nix/nix-init/default.nix
View file

@ -4,10 +4,9 @@
, fetchFromGitHub
, curl
, installShellFiles
, makeBinaryWrapper
, pkg-config
, bzip2
, libgit2_1_5
, libgit2
, openssl
, zlib
, zstd
@ -26,28 +25,27 @@ in
rustPlatform.buildRustPackage rec {
pname = "nix-init";
version = "0.2.3";
version = "0.2.4";
src = fetchFromGitHub {
owner = "nix-community";
repo = "nix-init";
rev = "v${version}";
hash = "sha256-QxGPBGCCjbQ1QbJNoW0dwQS/srwQ0hBR424zmcqdjI8=";
hash = "sha256-VP0UwJhiY6gDF3tBI1DOW0B4XAl9CzTHzgIP68iF4VM=";
};
cargoHash = "sha256-+Vj3TqNxMgaUmhzCgSEGl58Jh1PLsC6q/DfDbfg2mmo=";
cargoHash = "sha256-x1zRQGWN2NOvDDrQgkeObf6eNoCGMSw3DVgwVqfbI48=";
nativeBuildInputs = [
curl
installShellFiles
makeBinaryWrapper
pkg-config
];
buildInputs = [
bzip2
curl
libgit2_1_5
libgit2
openssl
zlib
zstd
@ -76,14 +74,14 @@ rustPlatform.buildRustPackage rec {
'';
postInstall = ''
wrapProgram $out/bin/nix-init \
--prefix PATH : ${lib.makeBinPath [ nix nurl ]}
installManPage artifacts/nix-init.1
installShellCompletion artifacts/nix-init.{bash,fish} --zsh artifacts/_nix-init
'';
env = {
GEN_ARTIFACTS = "artifacts";
NIX = lib.getExe nix;
NURL = lib.getExe nurl;
ZSTD_SYS_USE_PKG_CONFIG = true;
};

4
pkgs/top-level/all-packages.nix
View file

@ -23618,7 +23618,9 @@ with pkgs;
ngtcp2 = callPackage ../development/libraries/ngtcp2 { };
ngtcp2-gnutls = callPackage ../development/libraries/ngtcp2/gnutls.nix { };
nix-plugins = callPackage ../development/libraries/nix-plugins { };
nix-plugins = callPackage ../development/libraries/nix-plugins {
nix = nixVersions.nix_2_16;
};
nika-fonts = callPackage ../data/fonts/nika-fonts { };