nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 09:23:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-09-23 06:01:47 +00:00 committed by GitHub
commit 194b50aba8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "upwork";
version = "5.6.7.13";
version = "5.6.8.0";
src = fetchurl {
url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_7_13_9f0e0a44a59e4331/${pname}_${version}_amd64.deb";
sha256 = "f1d3168cda47f77100192ee97aa629e2452fe62fb364dd59ad361adbc0d1da87";
url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_8_0_836f43f6f6be4149/${pname}_${version}_amd64.deb";
sha256 = "b3a52f773d633837882dc107b206006325722ca5d5d5a1e8bdf5453f872e1b6f";
};
dontWrapGApps = true;

6
pkgs/development/compilers/gleam/default.nix
View File

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "gleam";
version = "0.16.1";
version = "0.17.0";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = pname;
rev = "v${version}";
sha256 = "sha256-JivBYBhXTti285pO4HNhalj0WeR/Hly3IjxpA+qauWY=";
sha256 = "sha256-HFcJUOfWMgMm+Sc3nAXW6FwXkiY34826QxMZ8rWPmnk=";
};
nativeBuildInputs = [ pkg-config ];
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++
lib.optionals stdenv.isDarwin [ Security libiconv ];
cargoSha256 = "sha256-SemHpvZ0lMqyMcgHPnmqI4C1krAJMM0hKCNNVMrulfI=";
cargoSha256 = "sha256-zjb+ERikMwC+ulfx6EW+FXLweZACwKNw4HEIc9dH3+4=";
meta = with lib; {
description = "A statically typed language for the Erlang VM";

8
pkgs/development/compilers/llvm/13/lld/default.nix
View File

@ -18,6 +18,14 @@ stdenv.mkDerivation rec {
./gnu-install-dirs.patch
];
# On Darwin the llvm-config is perhaps not working fine as the
# LLVM_MAIN_SRC_DIR is not getting set correctly, and the build fails as the
# include path is not correct.
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace MachO/CMakeLists.txt --replace \
'(''${LLVM_MAIN_SRC_DIR}/' '(../'
'';
nativeBuildInputs = [ cmake ];
buildInputs = [ libllvm libxml2 ];

4
pkgs/development/tools/esbuild/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "esbuild";
version = "0.12.28";
version = "0.13.0";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
sha256 = "sha256-SCOY70slGjTT9mUtaSr7qa1PF3nD7AM4AyP1CTVeWuY=";
sha256 = "sha256-NPpWK99P4p8GM4MNaIT8MLPzRNHiRh2yrwqG1A0KluM=";
};
vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs=";

4
pkgs/misc/base16-shell-preview/default.nix
View File

@ -2,12 +2,12 @@
python3Packages.buildPythonApplication rec {
pname = "base16-shell-preview";
version = "0.3.0";
version = "1.0.0";
src = python3Packages.fetchPypi {
inherit version;
pname = "base16_shell_preview";
sha256 = "0x2fbicrcqgf2dl7dqzm14dz08vjjziabaaw33wah3v9wv4rw7jq";
sha256 = "098f3z81g3acgcrisipz0nh17n9kx7ld6h8dg26qz3nx31pngsxd";
};
# No tests

8
pkgs/os-specific/bsd/netbsd/default.nix
View File

@ -188,8 +188,6 @@ in lib.makeScopeWithSplicing
bsdSetupHook netbsdSetupHook
makeMinimal
rsync
] ++ lib.optionals stdenv.buildPlatform.isDarwin [
buildPackages.binutils
];
buildInputs = with self; commonDeps;
@ -204,9 +202,15 @@ in lib.makeScopeWithSplicing
"TSORT=cat"
# Can't process man pages yet
"MKSHARE=no"
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
# GNU objcopy produces broken .a libs which won't link into dependers.
# Makefiles only invoke `$OBJCOPY -x/-X`, so cctools strip works here.
"OBJCOPY=${buildPackages.darwin.cctools}/bin/strip"
];
RENAME = "-D";
passthru.tests = { netbsd-install = self.install; };
patches = [
./compat-cxx-safe-header.patch
./compat-dont-configure-twice.patch

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "headscale";
version = "0.7.1";
version = "0.8.1";
src = fetchFromGitHub {
owner = "juanfont";
repo = "headscale";
rev = "v${version}";
sha256 = "sha256-/mpSIS3UajxFTQm+/Ko6e0hZ8kbPWSNNctaYKaGl8Gs=";
sha256 = "sha256-xNsdq8qcf2V+OQkRPBVys8SiusFoahezzQet19dYqlw=";
};
vendorSha256 = "sha256-ususDOF/LznhK4EInHE7J/ItMjziGfP9Gn8/Q5wd78g=";