ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 08:59:32 +03:00
Code Issues Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-10-02 12:01:09 +00:00 committed by GitHub
commit d03095b67a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 45 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,10 +13,10 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "03z6wpzbvf046sl1mjvvcshy5czvr4bq2f3ajlr8bj39y9df93h9";
x86_64-darwin = "0cs5ikf5dxkg9qkyaq75h0rypil80sk6zmbb0s63191gj6l569yl";
aarch64-linux = "05ivgn72v05yy3a9qly4qx0qpyjd2r3ygdw978zc8z09694g5x3i";
armv7l-linux = "044izh9ap5s50k796zjcfk0p997b7sfryshp4gaxh3yf5qs0w7l9";
x86_64-linux = "11zj9b8zhgfyh3m78ihg1k78m3v1khwa742mmsxji6ryxqkhvnr4";
x86_64-darwin = "19jk8rry11dvyfprq8i2j9r9aj17kfxqx5hl069mlkz0ca18kxmc";
aarch64-linux = "01slccwqhh6njd8q278svbfxph5lajx77ns03yrj9iva8w48gixy";
armv7l-linux = "1g7zq6y99b5sg8g10hq50qr15m99n0cmydm6rl9dkyca2038ihbi";
}.${system};
sourceRoot = {
@ -31,7 +31,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.60.1";
version = "1.60.2";
pname = "vscodium";
executableName = "codium";

22
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -1,8 +1,8 @@
{
"stable": {
"version": "94.0.4606.61",
"sha256": "1gxrxmd2almwf067zycilyxkmc0d62h99ln8wp3n3i02bi9xnik4",
"sha256bin64": "116xrf8hcprbdpdx6a4xysac2phyvw88vs3n1bs24ly6pxydsasz",
"version": "94.0.4606.71",
"sha256": "0nywwcdjda1b1swfslks8i28qq6jx9gyw50bhl8c2plcc0pbmfya",
"sha256bin64": "1ffa9hqs7ibch0by574l01lwhi5a1mhcyy1qrlr81ssq4pyygrq4",
"deps": {
"gn": {
"version": "2021-08-11",
@ -12,9 +12,9 @@
}
},
"chromedriver": {
"version": "94.0.4606.41",
"sha256_linux": "06flgis4am4jmd9qz6yn1jfdr07w2n3mfrlicw6a9icg5ir64fdq",
"sha256_darwin": "1mc0hhksqm5ms4k4aji043xzxncbifjwz5fqzywy4ji64w5kqrca"
"version": "94.0.4606.61",
"sha256_linux": "1l7ls8qqqd9q3a20a459q40jd9djzf67s8qfdmfj44vwgidiw0fj",
"sha256_darwin": "1b43agdd6vw5zarrbbk1sgmdr6n3d9cdl4dcikk304yplh58d49v"
}
},
"beta": {
@ -44,9 +44,9 @@
}
},
"ungoogled-chromium": {
"version": "94.0.4606.61",
"sha256": "1gxrxmd2almwf067zycilyxkmc0d62h99ln8wp3n3i02bi9xnik4",
"sha256bin64": "116xrf8hcprbdpdx6a4xysac2phyvw88vs3n1bs24ly6pxydsasz",
"version": "94.0.4606.71",
"sha256": "0nywwcdjda1b1swfslks8i28qq6jx9gyw50bhl8c2plcc0pbmfya",
"sha256bin64": "1ffa9hqs7ibch0by574l01lwhi5a1mhcyy1qrlr81ssq4pyygrq4",
"deps": {
"gn": {
"version": "2021-08-11",
@ -55,8 +55,8 @@
"sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0"
},
"ungoogled-patches": {
"rev": "94.0.4606.61-1",
"sha256": "1sb6n3dnp8d1bzhyl9d8yc0x9imyccnwxf1fqzv7vs3fd6dgcprp"
"rev": "94.0.4606.71-1",
"sha256": "12p39ay8lmdni6gnmw3w67pg4w3nrphhgn6bmz3cr6cy7nx4kiv2"
}
}
}

2
pkgs/development/compilers/llvm/13/default.nix
View File

@ -19,7 +19,7 @@
let
release_version = "13.0.0";
candidate = "rc4"; # empty or "rcN"
candidate = ""; # empty or "rcN"
dash-candidate = lib.optionalString (candidate != "") "-${candidate}";
rev = ""; # When using a Git commit
rev-version = ""; # When using a Git commit

2
pkgs/development/libraries/libkeyfinder/default.nix → pkgs/development/libraries/audio/libkeyfinder/default.nix
View File

@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
description = "Musical key detection for digital audio (C++ library)";
homepage = "https://mixxxdj.github.io/libkeyfinder/";
license = licenses.gpl3Plus;
platforms = platforms.linux;
platforms = platforms.unix;
};
}

2
pkgs/development/libraries/audio/libsmf/default.nix
View File

@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/stump/libsmf";
license = licenses.bsd2;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

2
pkgs/development/libraries/audio/lilv/default.nix
View File

@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
description = "A C library to make the use of LV2 plugins";
license = licenses.mit;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

2
pkgs/development/libraries/audio/lvtk/default.nix
View File

@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
homepage = "https://lvtk.org/";
license = licenses.gpl3;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

2
pkgs/development/libraries/audio/qm-dsp/default.nix
View File

@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
homepage = "https://code.soundsoftware.ac.uk/projects/qm-dsp";
license = licenses.gpl2Plus;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

2
pkgs/development/libraries/audio/raul/default.nix
View File

@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
homepage = "http://drobilla.net/software/raul";
license = licenses.gpl3;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

2
pkgs/development/libraries/audio/sratom/default.nix
View File

@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
description = "A library for serialising LV2 atoms to/from RDF";
license = licenses.mit;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

2
pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix
View File

@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
homepage = "https://vamp-plugins.org/";
license = licenses.bsd3;
maintainers = [ maintainers.goibhniu maintainers.marcweber ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

4
pkgs/development/libraries/intel-media-driver/default.nix
View File

@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
pname = "intel-media-driver";
version = "21.3.3";
version = "21.3.4";
outputs = [ "out" "dev" ];
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
owner = "intel";
repo = "media-driver";
rev = "intel-media-${version}";
sha256 = "1j33qq53jjmcvpr9w1xlyl5bpmq4rmshrd123l9alc2ddqbngrf7";
sha256 = "1ch1bvqg6p0i7ahblhy0h9c43y2mfhqb25v1s344iqsrywwcpzzr";
};
cmakeFlags = [

6
pkgs/development/ocaml-modules/logs/default.nix
View File

@ -1,6 +1,7 @@
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild
, topkg, result, lwt, cmdliner, fmt
, js_of_ocaml
, jsooSupport ? true
}:
let
pname = "logs";
@ -21,10 +22,11 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ ocaml findlib ocamlbuild ];
buildInputs = [ findlib topkg fmt cmdliner js_of_ocaml lwt ];
buildInputs = [ findlib topkg fmt cmdliner lwt ]
++ lib.optional jsooSupport js_of_ocaml;
propagatedBuildInputs = [ result ];
buildPhase = "${topkg.run} build --with-js_of_ocaml true";
buildPhase = "${topkg.run} build --with-js_of_ocaml ${lib.boolToString jsooSupport}";
inherit (topkg) installPhase;

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

@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "restfly";
version = "1.4.1";
version = "1.4.2";
src = fetchFromGitHub {
owner = "stevemcgrath";
repo = pname;
rev = version;
sha256 = "03k1843llpi4ycd450j5x8bd58vxsbfw43p81hsawidsx4c6bk85";
sha256 = "sha256-1sLkjM6hRAbfrZEXP97N9ZDqpL255LC7JS1r2yOXG5E=";
};
propagatedBuildInputs = [

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

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "hcloud";
version = "1.27.0";
version = "1.28.0";
src = fetchFromGitHub {
owner = "hetznercloud";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-bvPMSys2EY8cMNQ3rG4WlXaI9k2JsEWQkMZnDgcNFhY=";
sha256 = "sha256-ySCfU/VWZz6tSZbrbhT/OIoxme+Y53eFtlVTI43yNVA=";
};
nativeBuildInputs = [ installShellFiles ];
vendorSha256 = "sha256-/bqlDcv4lQ49NM849MTlna36ENfzUfcHtwuo75I77VQ=";
vendorSha256 = "sha256-G3kiaYoCyoltyS/OlecJHaYWpeFax1qonOJZr30wSV8=";
doCheck = false;

6
pkgs/servers/jetbrains/youtrack.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, makeWrapper, jre, gawk }:
{ lib, stdenv, fetchurl, makeWrapper, jdk11, gawk }:
stdenv.mkDerivation rec {
pname = "youtrack";
@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
makeWrapper ${jre}/bin/java $out/bin/youtrack \
makeWrapper ${jdk11}/bin/java $out/bin/youtrack \
--add-flags "\$YOUTRACK_JVM_OPTS -jar $jar" \
--prefix PATH : "${lib.makeBinPath [ gawk ]}" \
--set JRE_HOME ${jre}
--set JRE_HOME ${jdk11}
runHook postInstall
'';

5
pkgs/tools/security/metasploit/default.nix
View File

@ -40,6 +40,11 @@ in stdenv.mkDerivation rec {
done
)
makeWrapper ${env}/bin/bundle $out/bin/msf-pattern_create \
--add-flags "exec ${ruby}/bin/ruby $out/share/msf/tools/exploit/pattern_create.rb"
makeWrapper ${env}/bin/bundle $out/bin/msf-pattern_offset \
--add-flags "exec ${ruby}/bin/ruby $out/share/msf/tools/exploit/pattern_offset.rb"
'';
# run with: nix-shell maintainers/scripts/update.nix --argstr path metasploit

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

@ -17456,7 +17456,7 @@ with pkgs;
libkate = callPackage ../development/libraries/libkate { };
libkeyfinder = callPackage ../development/libraries/libkeyfinder { };
libkeyfinder = callPackage ../development/libraries/audio/libkeyfinder { };
libkml = callPackage ../development/libraries/libkml { };