swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 21:09:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse source
This commit is contained in:
Dmitry Kalinkin 2021-08-28 00:52:21 -04:00
parent c65ec0c87d 45131df167
commit abd395d269
No known key found for this signature in database
GPG key ID: 5157B3EC8B2CA333
6 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/desktops/gnome/core/simple-scan/default.nix
View file

@ -25,11 +25,11 @@
stdenv.mkDerivation rec {
pname = "simple-scan";
version = "40.0";
version = "40.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "sha256-E4EbsqhhnmOkP8Lva3E1ny1cQITG1cizqtYXJLIHUa8=";
sha256 = "sha256-6+45qx/kygU8TtK9OjynZ0L/EJQ23QZF00FWIhMroLQ=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/aiolifx/default.nix
View file

@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "aiolifx";
version = "0.6.9";
version = "0.6.10";
src = fetchPypi {
inherit pname version;
sha256 = "0c28e9c058ee504a07eec11cb333bc6496d233da100dcab9c33549e9eb4985c0";
sha256 = "b3aaf814dbc03666b22b08103990f260e58616ea64f2a28396653ef3b5fad4f9";
};
# tests are not implemented

14
pkgs/development/tools/remarshal/default.nix → pkgs/development/python-modules/remarshal/default.nix
View file

@ -1,15 +1,21 @@
{ lib, python3Packages }:
{ lib, buildPythonApplication, fetchPypi
, cbor2
, python-dateutil
, pyyaml
, tomlkit
, u-msgpack-python
}:
python3Packages.buildPythonApplication rec {
buildPythonApplication rec {
pname = "remarshal";
version = "0.14.0";
src = python3Packages.fetchPypi {
src = fetchPypi {
inherit pname version;
sha256 = "16425aa1575a271dd3705d812b06276eeedc3ac557e7fd28e06822ad14cd0667";
};
propagatedBuildInputs = with python3Packages; [
propagatedBuildInputs = [
pyyaml cbor2 python-dateutil tomlkit u-msgpack-python
];

4
pkgs/os-specific/linux/kernel/linux-xanmod.nix
View file

@ -1,7 +1,7 @@
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
let
version = "5.13.12";
version = "5.13.13";
release = "1";
suffix = "xanmod${release}-cacule";
in
@ -13,7 +13,7 @@ buildLinux (args // rec {
owner = "xanmod";
repo = "linux";
rev = modDirVersion;
sha256 = "sha256-cuZ8o0Ogi2dg4kVoFv4aqThRPDVI271i+DVw5Z4R7Kg=";
sha256 = "sha256-qRJuTkTmsKbCCGrzq62o+1RrvTGM74p4mqy9AQ8hvD0=";
};
structuredExtraConfig = with lib.kernel; {

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

@ -8355,7 +8355,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
remarshal = callPackage ../development/tools/remarshal { };
remarshal = with python3Packages; toPythonApplication remarshal;
rehex = callPackage ../applications/editors/rehex {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit;

2
pkgs/top-level/python-packages.nix
View file

@ -7639,6 +7639,8 @@ in {
relatorio = callPackage ../development/python-modules/relatorio { };
remarshal = callPackage ../development/python-modules/remarshal { };
rencode = callPackage ../development/python-modules/rencode { };
reparser = callPackage ../development/python-modules/reparser { };