commit 1e3d91bd19fcfd603eb27d62378dac72f867e94e · pyrox.dev/nixpkgs

+12

maintainers/maintainer-list.nix

···

       428
        
           githubId = 782180;

     

       429
        
           name = "Alex Vorobiev";

     

       430
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       431
        
         algorith = {

     

       432
        
           email = "dries_van_daele@telenet.be";

     

       433
        
           name = "Dries Van Daele";

     
···

       7248
        
           github = "noneucat";

     

       7249
        
           githubId = 40049608;

     

       7250
        
           name = "Andy Chun";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       7251
        
         };

     

       7252
        
         norfair = {

     

       7253
        
           email = "syd@cs-syd.eu";

···

       428
        
           githubId = 782180;

     

       429
        
           name = "Alex Vorobiev";

     

       430
        
         };

     

       431
       +
         alex-eyre = {

     

       432
       +
           email = "A.Eyre@sms.ed.ac.uk";

     

       433
       +
           github = "alex-eyre";

     

       434
       +
           githubId = 38869148;

     

       435
       +
           name = "Alex Eyre";

     

       436
       +
         };

     

       437
        
         algorith = {

     

       438
        
           email = "dries_van_daele@telenet.be";

     

       439
        
           name = "Dries Van Daele";

     
···

       7254
        
           github = "noneucat";

     

       7255
        
           githubId = 40049608;

     

       7256
        
           name = "Andy Chun";

     

       7257
       +
         };

     

       7258
       +
         noreferences = {

     

       7259
       +
           email = "norkus@norkus.net";

     

       7260
       +
           github = "noreferences";

     

       7261
       +
           githubId = 13085275;

     

       7262
       +
           name = "Juozas Norkus";

     

       7263
        
         };

     

       7264
        
         norfair = {

     

       7265
        
           email = "syd@cs-syd.eu";

+1 -1

nixos/tests/web-servers/unit-php.nix

···

       34
        
           };

     

       35
        
           users = {

     

       36
        
             users.testuser = {

     

       37
       -
               isNormalUser = false;

     

       38
        
               uid = 1074;

     

       39
        
               group = "testgroup";

     

       40
        
             };

···

       34
        
           };

     

       35
        
           users = {

     

       36
        
             users.testuser = {

     

       37
       +
               isSystemUser = true;

     

       38
        
               uid = 1074;

     

       39
        
               group = "testgroup";

     

       40
        
             };

+2 -2

pkgs/applications/graphics/feh/default.nix

···

       7
        
       

     

       8
        
       stdenv.mkDerivation rec {

     

       9
        
         pname = "feh";

     

       10
       -
         version = "3.6.3";

     

       11
        
       

     

       12
        
         src = fetchurl {

     

       13
        
           url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2";

     

       14
       -
           sha256 = "sha256-Q3Qg838RYU4AjQZuKjve/Px4FEyCEpmLK6zdXSHqI7Q=";

     

       15
        
         };

     

       16
        
       

     

       17
        
         outputs = [ "out" "man" "doc" ];

···

       7
        
       

     

       8
        
       stdenv.mkDerivation rec {

     

       9
        
         pname = "feh";

     

       10
       +
         version = "3.7";

     

       11
        
       

     

       12
        
         src = fetchurl {

     

       13
        
           url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2";

     

       14
       +
           sha256 = "0hdvlrlpjxvmhnjvr32nxgpsw0366higg0gh9h37fxrvdh3v3k87";

     

       15
        
         };

     

       16
        
       

     

       17
        
         outputs = [ "out" "man" "doc" ];

+2 -2

pkgs/applications/misc/moonlight-qt/default.nix

···

       19
        
       

     

       20
        
       stdenv.mkDerivation rec {

     

       21
        
         pname = "moonlight-qt";

     

       22
       -
         version = "3.1.0";

     

       23
        
       

     

       24
        
         src = fetchFromGitHub {

     

       25
        
           owner = "moonlight-stream";

     

       26
        
           repo = pname;

     

       27
        
           rev = "v${version}";

     

       28
       -
           sha256 = "e7fwb76zzidtF1COqrQ6gSF7bCX20j/CGjPu1Cb4HGc=";

     

       29
        
           fetchSubmodules = true;

     

       30
        
         };

     

       31

···

       19
        
       

     

       20
        
       stdenv.mkDerivation rec {

     

       21
        
         pname = "moonlight-qt";

     

       22
       +
         version = "3.1.1";

     

       23
        
       

     

       24
        
         src = fetchFromGitHub {

     

       25
        
           owner = "moonlight-stream";

     

       26
        
           repo = pname;

     

       27
        
           rev = "v${version}";

     

       28
       +
           sha256 = "1bz4wjl8zydw46bh2mdbrsx8prh2fw0cmzqliy912fdz5aal2b74";

     

       29
        
           fetchSubmodules = true;

     

       30
        
         };

     

       31

+28

pkgs/applications/misc/nimbo/default.nix

···

       1
       +
       { lib, setuptools, boto3, requests, click, pyyaml, pydantic, buildPythonApplication

     

       2
       +
       , pythonOlder, fetchFromGitHub, awscli }:

     

       3
       +
       

     

       4
       +
       buildPythonApplication rec {

     

       5
       +
         pname = "nimbo";

     

       6
       +
         version = "0.2.4";

     

       7
       +
         disabled = pythonOlder "3.6";

     

       8
       +
       

     

       9
       +
         src = fetchFromGitHub {

     

       10
       +
           owner = "nimbo-sh";

     

       11
       +
           repo = pname;

     

       12
       +
           rev = "v${version}";

     

       13
       +
           sha256 = "1fs28s9ynfxrb4rzba6cmik0kl0q0vkpb4zdappsq62jqf960k24";

     

       14
       +
         };

     

       15
       +
       

     

       16
       +
         propagatedBuildInputs = [ setuptools boto3 awscli requests click pyyaml pydantic ];

     

       17
       +
       

     

       18
       +
         # nimbo tests require an AWS instance

     

       19
       +
         doCheck = false;

     

       20
       +
         pythonImportsCheck = [ "nimbo" ];

     

       21
       +
       

     

       22
       +
         meta = with lib; {

     

       23
       +
           description = "Run machine learning jobs on AWS with a single command";

     

       24
       +
           homepage = "https://github.com/nimbo-sh/nimbo";

     

       25
       +
           license = licenses.bsl11;

     

       26
       +
           maintainers = with maintainers; [ alex-eyre noreferences ];

     

       27
       +
         };

     

       28
       +
       }

+3 -2

pkgs/applications/networking/flexget/default.nix

···

       2
        
       

     

       3
        
       python3Packages.buildPythonApplication rec {

     

       4
        
         pname = "FlexGet";

     

       5
       -
         version = "3.1.116";

     

       6
        
       

     

       7
        
         src = python3Packages.fetchPypi {

     

       8
        
           inherit pname version;

     

       9
       -
           sha256 = "6372b36495ae023bd64ce28ca649feba54b060ed8f0a5f606a4845974e834493";

     

       10
        
         };

     

       11
        
       

     

       12
        
         postPatch = ''

     
···

       35
        
           flask-restful

     

       36
        
           flask-restx

     

       37
        
           flask

     

       0
        
       
     

       38
        
           guessit

     

       39
        
           html5lib

     

       40
        
           jinja2

···

       2
        
       

     

       3
        
       python3Packages.buildPythonApplication rec {

     

       4
        
         pname = "FlexGet";

     

       5
       +
         version = "3.1.121";

     

       6
        
       

     

       7
        
         src = python3Packages.fetchPypi {

     

       8
        
           inherit pname version;

     

       9
       +
           sha256 = "91270a51ed29e4a578c7549ebd01665f4bcf49bf7773a15db27f4ccb13659e00";

     

       10
        
         };

     

       11
        
       

     

       12
        
         postPatch = ''

     
···

       35
        
           flask-restful

     

       36
        
           flask-restx

     

       37
        
           flask

     

       38
       +
           greenlet

     

       39
        
           guessit

     

       40
        
           html5lib

     

       41
        
           jinja2

+89

pkgs/applications/office/timeline/default.nix

···

       1
       +
       { lib

     

       2
       +
       , fetchurl

     

       3
       +
       , python3

     

       4
       +
       , gettext

     

       5
       +
       , makeDesktopItem

     

       6
       +
       , copyDesktopItems

     

       7
       +
       }:

     

       8
       +
       

     

       9
       +
       python3.pkgs.buildPythonApplication rec {

     

       10
       +
         pname = "timeline";

     

       11
       +
         version = "2.4.0";

     

       12
       +
       

     

       13
       +
         src = fetchurl {

     

       14
       +
           url = "mirror://sourceforge/thetimelineproj/${pname}-${version}.zip";

     

       15
       +
           sha256 = "1pa0whqci6c2p20xf7gbndrrpr1xg42ixhql595ibdd4p3l37v23";

     

       16
       +
         };

     

       17
       +
       

     

       18
       +
         nativeBuildInputs = [ python3.pkgs.wrapPython copyDesktopItems ];

     

       19
       +
       

     

       20
       +
         pythonPath = with python3.pkgs; [

     

       21
       +
           wxPython_4_0 # not compatible with wxPython_4_1. reported upstream https://github.com/wxWidgets/Phoenix/issues/1956

     

       22
       +
           humblewx

     

       23
       +
           icalendar

     

       24
       +
           markdown

     

       25
       +
           pysvg-py3

     

       26
       +
           pillow

     

       27
       +
         ];

     

       28
       +
       

     

       29
       +
         checkInputs = [

     

       30
       +
           gettext

     

       31
       +
           python3.pkgs.mock

     

       32
       +
         ];

     

       33
       +
       

     

       34
       +
         desktopItems = [

     

       35
       +
           (makeDesktopItem {

     

       36
       +
             desktopName = "Timeline";

     

       37
       +
             name = "timeline";

     

       38
       +
             comment = "Display and navigate information on a timeline";

     

       39
       +
             icon = "timeline";

     

       40
       +
             terminal = false;

     

       41
       +
             exec = "timeline";

     

       42
       +
             categories = "Office;Calendar;";

     

       43
       +
           })

     

       44
       +
         ];

     

       45
       +
       

     

       46
       +
         dontBuild = true;

     

       47
       +
         doCheck = false;

     

       48
       +
       

     

       49
       +
         patchPhase = ''

     

       50
       +
           sed -i "s|_ROOT =.*|_ROOT = \"$out/usr/share/timeline/\"|" source/timelinelib/config/paths.py

     

       51
       +
         '';

     

       52
       +
       

     

       53
       +
         installPhase = ''

     

       54
       +
           runHook preInstall

     

       55
       +
       

     

       56
       +
           site_packages=$out/${python3.pkgs.python.sitePackages}

     

       57
       +
           install -D -m755 source/timeline.py $out/bin/timeline

     

       58
       +
           mkdir -p $site_packages

     

       59
       +
           cp -r source/timelinelib $site_packages/

     

       60
       +
       

     

       61
       +
           mkdir -p $out/usr/share/timeline/locale

     

       62
       +
           cp -r icons $out/usr/share/timeline/

     

       63
       +
           cp -r translations/ $out/usr/share/timeline/

     

       64
       +
       

     

       65
       +
           mkdir -p $out/share/icons/hicolor/{48x48,32x32,16x16}/apps

     

       66
       +
           cp icons/48.png $out/share/icons/hicolor/48x48/apps/timeline.png

     

       67
       +
           cp icons/32.png $out/share/icons/hicolor/32x32/apps/timeline.png

     

       68
       +
           cp icons/16.png $out/share/icons/hicolor/16x16/apps/timeline.png

     

       69
       +
       

     

       70
       +
           runHook postInstall

     

       71
       +
         '';

     

       72
       +
       

     

       73
       +
         # tests fail because they need an x server

     

       74
       +
         # Unable to access the X Display, is $DISPLAY set properly?

     

       75
       +
         checkPhase = ''

     

       76
       +
           runHook preCheck

     

       77
       +
           ${python3.interpreter} tools/execute-specs.py

     

       78
       +
           runHook postCheck

     

       79
       +
         '';

     

       80
       +
       

     

       81
       +
         meta = with lib; {

     

       82
       +
           homepage = "http://thetimelineproj.sourceforge.net/";

     

       83
       +
           changelog = "http://thetimelineproj.sourceforge.net/changelog.html";

     

       84
       +
           description = "Display and navigate information on a timeline";

     

       85
       +
           license = with licenses; [ gpl3Only cc-by-sa-30 ];

     

       86
       +
           platforms = with platforms; unix;

     

       87
       +
           maintainers = with maintainers; [ davidak ];

     

       88
       +
         };

     

       89
       +
       }

+11 -14

pkgs/applications/science/logic/coq2html/default.nix

···

       1
       -
       { lib, stdenv, fetchgit, ocaml }:

     

       2
        
       

     

       3
       -
       let

     

       4
       -
         version = "20170720";

     

       5
       -
       in

     

       6
       -
       

     

       7
       -
       stdenv.mkDerivation {

     

       8
        
         pname = "coq2html";

     

       9
       -
         inherit version;

     

       10
        
       

     

       11
       -
         src = fetchgit {

     

       12
       -
           url = "https://github.com/xavierleroy/coq2html";

     

       13
       -
           rev = "e2b94093c6b9a877717f181765e30577de22439e";

     

       14
       -
           sha256 = "1x466j0pyjggyz0870pdllv9f5vpnfrgkd0w7ajvm9rkwyp3f610";

     

       0
        
       
     

       15
        
         };

     

       16
        
       

     

       17
       -
         buildInputs = [ ocaml ];

     

       18
        
       

     

       19
        
         installPhase = ''

     

       20
        
           mkdir -p $out/bin

     
···

       32
        
             "Proof" keyword.

     

       33
        
           '';

     

       34
        
           homepage = "https://github.com/xavierleroy/coq2html";

     

       35
       -
           license = licenses.gpl2;

     

       36
       -
           maintainers = with maintainers; [ jwiegley ];

     

       37
        
           platforms = platforms.unix;

     

       38
        
         };

     

       39
        
       }

···

       1
       +
       { lib, stdenv, fetchFromGitHub, ocaml }:

     

       2
        
       

     

       3
       +
       stdenv.mkDerivation  rec {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       4
        
         pname = "coq2html";

     

       5
       +
         version = "1.2";

     

       6
        
       

     

       7
       +
         src = fetchFromGitHub {

     

       8
       +
           owner = "xavierleroy";

     

       9
       +
           repo = "coq2html";

     

       10
       +
           rev = "v${version}";

     

       11
       +
           sha256 = "sha256-ty/6A3wivjDCrmlZAcZyaIwQQ+vPBJm9MhtW6nZcV3s=";

     

       12
        
         };

     

       13
        
       

     

       14
       +
         nativeBuildInputs = [ ocaml ];

     

       15
        
       

     

       16
        
         installPhase = ''

     

       17
        
           mkdir -p $out/bin

     
···

       29
        
             "Proof" keyword.

     

       30
        
           '';

     

       31
        
           homepage = "https://github.com/xavierleroy/coq2html";

     

       32
       +
           license = licenses.gpl2Plus;

     

       33
       +
           maintainers = with maintainers; [ jwiegley siraben ];

     

       34
        
           platforms = platforms.unix;

     

       35
        
         };

     

       36
        
       }

+115

pkgs/applications/window-managers/cardboard/default.nix

···

       1
       +
       { lib

     

       2
       +
       , stdenv

     

       3
       +
       , fetchFromGitLab

     

       4
       +
       , fetchurl

     

       5
       +
       , fetchgit

     

       6
       +
       , ffmpeg

     

       7
       +
       , libGL

     

       8
       +
       , libX11

     

       9
       +
       , libcap

     

       10
       +
       , libdrm

     

       11
       +
       , libinput

     

       12
       +
       , libpng

     

       13
       +
       , libxcb

     

       14
       +
       , libxkbcommon

     

       15
       +
       , mesa

     

       16
       +
       , meson

     

       17
       +
       , ninja

     

       18
       +
       , pixman

     

       19
       +
       , pkg-config

     

       20
       +
       , unzip

     

       21
       +
       , wayland

     

       22
       +
       , wayland-protocols

     

       23
       +
       , xcbutilerrors

     

       24
       +
       , xcbutilimage

     

       25
       +
       , xcbutilwm

     

       26
       +
       }:

     

       27
       +
       

     

       28
       +
       let

     

       29
       +
         # cereal.wrap

     

       30
       +
         cereal-wrap = fetchurl {

     

       31
       +
           name = "cereal-1.3.0.tar.gz";

     

       32
       +
           url = "https://github.com/USCiLab/cereal/archive/v1.3.0.tar.gz";

     

       33
       +
           hash = "sha256-Mp6j4xMLAmwDpKzFDhaOfa/05uZhvGp9/sDXe1cIUdU=";

     

       34
       +
         };

     

       35
       +
         cereal-wrapdb = fetchurl {

     

       36
       +
           name = "cereal-1.3.0-1-wrap.zip";

     

       37
       +
           url = "https://wrapdb.mesonbuild.com/v1/projects/cereal/1.3.0/1/get_zip";

     

       38
       +
           hash = "sha256-QYck5UT7fPLqtLDb1iOSX4Hnnns48Jj23Ae/LCfLSKY=";

     

       39
       +
         };

     

       40
       +
       

     

       41
       +
         # expected.wrap

     

       42
       +
         expected-wrap = fetchgit {

     

       43
       +
           name = "expected";

     

       44
       +
           url = "https://gitlab.com/cardboardwm/expected";

     

       45
       +
           rev = "0ee13cb2b058809aa9708c45ca18d494e72a759e";

     

       46
       +
           sha256 = "sha256-gYr4/pjuLlr3k6Jcrg2/SzJLtbgyA+ZN2oMHkHXANDo=";

     

       47
       +
         };

     

       48
       +
       

     

       49
       +
         # wlroots.wrap

     

       50
       +
         wlroots-wrap = fetchgit {

     

       51
       +
           name = "wlroots";

     

       52
       +
           url = "https://github.com/swaywm/wlroots";

     

       53
       +
           rev = "0.12.0";

     

       54
       +
           sha256 = "sha256-1rE3D+kQprjcjobc95/mQkUa5y1noY0MdoYJ/SpFQwY=";

     

       55
       +
         };

     

       56
       +
       in

     

       57
       +
       stdenv.mkDerivation rec {

     

       58
       +
         pname = "cardboard";

     

       59
       +
         version = "0.0.0-unstable=2021-01-21";

     

       60
       +
       

     

       61
       +
         src = fetchFromGitLab {

     

       62
       +
           owner = "cardboardwm";

     

       63
       +
           repo = pname;

     

       64
       +
           rev = "f2ef2ff076ddbbd23994553b8eff131f9bd0207f";

     

       65
       +
           hash = "sha256-43aqAWk4QoIP0BpRyPRDWFtVh/1UbrBoEeTDEF2gZX4=";

     

       66
       +
         };

     

       67
       +
       

     

       68
       +
         nativeBuildInputs = [

     

       69
       +
           meson

     

       70
       +
           ninja

     

       71
       +
           pkg-config

     

       72
       +
           unzip

     

       73
       +
         ];

     

       74
       +
         buildInputs = [

     

       75
       +
           ffmpeg

     

       76
       +
           libGL

     

       77
       +
           libX11

     

       78
       +
           libcap

     

       79
       +
           libdrm

     

       80
       +
           libinput

     

       81
       +
           libpng

     

       82
       +
           libxcb

     

       83
       +
           libxkbcommon

     

       84
       +
           mesa

     

       85
       +
           pixman

     

       86
       +
           wayland

     

       87
       +
           wayland-protocols

     

       88
       +
           xcbutilerrors

     

       89
       +
           xcbutilimage

     

       90
       +
           xcbutilwm

     

       91
       +
         ];

     

       92
       +
       

     

       93
       +
         postPatch = ''

     

       94
       +
           (cd subprojects

     

       95
       +
            tar xvf ${cereal-wrap}

     

       96
       +
            unzip ${cereal-wrapdb}

     

       97
       +
            cp -r ${expected-wrap} ${expected-wrap.name}

     

       98
       +
            cp -r ${wlroots-wrap} ${wlroots-wrap.name}

     

       99
       +
           )

     

       100
       +
         '';

     

       101
       +
       

     

       102
       +
         # "Inherited" from Nixpkgs expression for wlroots

     

       103
       +
         mesonFlags = [

     

       104
       +
           "-Dwlroots:logind-provider=systemd"

     

       105
       +
           "-Dwlroots:libseat=disabled"

     

       106
       +
         ];

     

       107
       +
       

     

       108
       +
         meta = with lib; {

     

       109
       +
           homepage = "https://gitlab.com/cardboardwm/cardboard";

     

       110
       +
           description = "A scrollable, tiling Wayland compositor inspired on PaperWM";

     

       111
       +
           license = licenses.gpl3Only;

     

       112
       +
           maintainers = with maintainers; [ AndersonTorres ];

     

       113
       +
           platforms = with platforms; unix;

     

       114
       +
         };

     

       115
       +
       }

+4 -3

pkgs/applications/window-managers/i3/status-rust.nix

···

       12
        
       

     

       13
        
       rustPlatform.buildRustPackage rec {

     

       14
        
         pname = "i3status-rust";

     

       15
       -
         version = "0.14.7";

     

       16
        
       

     

       17
        
         src = fetchFromGitHub {

     

       18
        
           owner = "greshake";

     

       19
        
           repo = pname;

     

       20
        
           rev = "v${version}";

     

       21
       -
           sha256 = "1ndqh4bzwim32n8psgsgdd47xmlb45rhvcwla1wm506byb21nk4c";

     

       22
        
         };

     

       23
        
       

     

       24
       -
         cargoSha256 = "098dzwqwbhcyswm73m880z0w03i7xrq56x79vfyvacw4k27q2zm9";

     

       25
        
       

     

       26
        
         nativeBuildInputs = [ pkg-config makeWrapper ];

     

       27
        
       

     
···

       29
        
       

     

       30
        
         cargoBuildFlags = [

     

       31
        
           "--features=notmuch"

     

       0
        
       
     

       32
        
         ];

     

       33
        
       

     

       34
        
         postFixup = ''

···

       12
        
       

     

       13
        
       rustPlatform.buildRustPackage rec {

     

       14
        
         pname = "i3status-rust";

     

       15
       +
         version = "0.20.0";

     

       16
        
       

     

       17
        
         src = fetchFromGitHub {

     

       18
        
           owner = "greshake";

     

       19
        
           repo = pname;

     

       20
        
           rev = "v${version}";

     

       21
       +
           sha256 = "sha256-rio+3S3bA8KfosKAE9Txzftr/q2PVyd8Z9crz1O/ysc=";

     

       22
        
         };

     

       23
        
       

     

       24
       +
         cargoSha256 = "sha256-17bIeK/mPE+rAO/c65IWvMGqAU6sOClJQC8z+O36cmU=";

     

       25
        
       

     

       26
        
         nativeBuildInputs = [ pkg-config makeWrapper ];

     

       27
        
       

     
···

       29
        
       

     

       30
        
         cargoBuildFlags = [

     

       31
        
           "--features=notmuch"

     

       32
       +
           "--features=maildir"

     

       33
        
         ];

     

       34
        
       

     

       35
        
         postFixup = ''

+2 -2

pkgs/data/themes/plano/default.nix

···

       11
        
       

     

       12
        
       stdenv.mkDerivation rec {

     

       13
        
         pname = "plano-theme";

     

       14
       -
         version = "3.36-2";

     

       15
        
       

     

       16
        
         src = fetchFromGitHub {

     

       17
        
           owner = "lassekongo83";

     

       18
        
           repo = pname;

     

       19
        
           rev = "v${version}";

     

       20
       -
           sha256 = "01dkjck9rlrf8wa30ad7kfv0gbpdf3l05rw7nxrvb1gh5d2vxig9";

     

       21
        
         };

     

       22
        
       

     

       23
        
         nativeBuildInputs = [

···

       11
        
       

     

       12
        
       stdenv.mkDerivation rec {

     

       13
        
         pname = "plano-theme";

     

       14
       +
         version = "3.38-1";

     

       15
        
       

     

       16
        
         src = fetchFromGitHub {

     

       17
        
           owner = "lassekongo83";

     

       18
        
           repo = pname;

     

       19
        
           rev = "v${version}";

     

       20
       +
           sha256 = "0g2mwvzc04z3dsdfhwqgw9s7987406pv22s9rbazfvprk4ddc5b6";

     

       21
        
         };

     

       22
        
       

     

       23
        
         nativeBuildInputs = [

+2 -2

pkgs/development/libraries/glfw/3.x.nix

···

       4
        
       }:

     

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
       -
         version = "3.3.3";

     

       8
        
         pname = "glfw";

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "glfw";

     

       12
        
           repo = "GLFW";

     

       13
        
           rev = version;

     

       14
       -
           sha256 = "sha256-NfEPXjpVnFvh3Y70RZm8nDG0QwJbefF9wYNUq0BZTN4=";

     

       15
        
         };

     

       16
        
       

     

       17
        
         propagatedBuildInputs = [ libGL ];

···

       4
        
       }:

     

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
       +
         version = "3.3.4";

     

       8
        
         pname = "glfw";

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "glfw";

     

       12
        
           repo = "GLFW";

     

       13
        
           rev = version;

     

       14
       +
           sha256 = "sha256-BP4wxjgm0x0E68tNz5eudkVUyBnXkQlP7LY3ppZunhw=";

     

       15
        
         };

     

       16
        
       

     

       17
        
         propagatedBuildInputs = [ libGL ];

+15 -7

pkgs/development/python-modules/bpython/default.nix

···

       3
        
       , fetchPypi

     

       4
        
       , curtsies

     

       5
        
       , greenlet

     

       6
       -
       , mock

     

       7
        
       , pygments

     

       0
        
       
     

       8
        
       , requests

     

       9
        
       , substituteAll

     

       10
        
       , urwid

     

       11
       -
       , which }:

     

       0
        
       
     

       0
        
       
     

       12
        
       

     

       13
        
       buildPythonPackage rec {

     

       14
        
         pname = "bpython";

     
···

       24
        
           which = "${which}/bin/which";

     

       25
        
         })];

     

       26
        
       

     

       27
       -
         propagatedBuildInputs = [ curtsies greenlet pygments requests urwid ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       28
        
       

     

       29
        
         postInstall = ''

     

       30
        
           substituteInPlace "$out/share/applications/org.bpython-interpreter.bpython.desktop" \

     

       31
        
             --replace "Exec=/usr/bin/bpython" "Exec=$out/bin/bpython"

     

       32
        
         '';

     

       33
        
       

     

       34
       -
         checkInputs = [ mock ];

     

       35
       -
       

     

       36
       -
         # tests fail: https://github.com/bpython/bpython/issues/712

     

       37
       -
         doCheck = false;

     

       38
        
       

     

       39
        
         meta = with lib; {

     

       40
        
           description = "A fancy curses interface to the Python interactive interpreter";

···

       3
        
       , fetchPypi

     

       4
        
       , curtsies

     

       5
        
       , greenlet

     

       6
       +
       , jedi

     

       7
        
       , pygments

     

       8
       +
       , pyxdg

     

       9
        
       , requests

     

       10
        
       , substituteAll

     

       11
        
       , urwid

     

       12
       +
       , watchdog

     

       13
       +
       , which

     

       14
       +
       }:

     

       15
        
       

     

       16
        
       buildPythonPackage rec {

     

       17
        
         pname = "bpython";

     
···

       27
        
           which = "${which}/bin/which";

     

       28
        
         })];

     

       29
        
       

     

       30
       +
         propagatedBuildInputs = [

     

       31
       +
           curtsies

     

       32
       +
           greenlet

     

       33
       +
           pygments

     

       34
       +
           pyxdg

     

       35
       +
           requests

     

       36
       +
           urwid

     

       37
       +
         ];

     

       38
        
       

     

       39
        
         postInstall = ''

     

       40
        
           substituteInPlace "$out/share/applications/org.bpython-interpreter.bpython.desktop" \

     

       41
        
             --replace "Exec=/usr/bin/bpython" "Exec=$out/bin/bpython"

     

       42
        
         '';

     

       43
        
       

     

       44
       +
         checkInputs = [ jedi watchdog ];

     

       45
       +
         pythonImportsCheck = [ "bpython" ];

     

       0
        
       
     

       0
        
       
     

       46
        
       

     

       47
        
         meta = with lib; {

     

       48
        
           description = "A fancy curses interface to the Python interactive interpreter";

+4 -12

pkgs/development/python-modules/curtsies/default.nix

···

       1
       -
       { lib, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, blessings, mock, nose, pyte, wcwidth, typing ? null}:

     

       2
        
       

     

       3
        
       buildPythonPackage rec {

     

       4
        
         pname = "curtsies";

     

       5
       -
         version = "0.3.0";

     

       6
        
         src = fetchPypi {

     

       7
        
           inherit pname version;

     

       8
       -
           sha256 = "89c802ec051d01dec6fc983e9856a3706e4ea8265d2940b1f6d504a9e26ed3a9";

     

       9
        
         };

     

       10
        
       

     

       11
       -
         patches = [

     

       12
       -
           # Fix dependency on typing. Remove with the next release

     

       13
       -
           (fetchpatch {

     

       14
       -
             url = "https://github.com/bpython/curtsies/commit/217b4f83e954837f8adc4c549c1f2f9f2bb272a7.patch";

     

       15
       -
             sha256 = "1d3zwx9c7i0drb4nvydalm9mr83jrvdm75ffgisri89h337hiffs";

     

       16
       -
           })

     

       17
       -
         ];

     

       18
       -
       

     

       19
       -
         propagatedBuildInputs = [ blessings wcwidth ]

     

       20
        
           ++ lib.optionals (pythonOlder "3.5") [ typing ];

     

       21
        
       

     

       22
        
         checkInputs = [ mock pyte nose ];

···

       1
       +
       { lib, buildPythonPackage, fetchPypi, pythonOlder, blessings, mock, nose, pyte, cwcwidth, typing ? null}:

     

       2
        
       

     

       3
        
       buildPythonPackage rec {

     

       4
        
         pname = "curtsies";

     

       5
       +
         version = "0.3.5";

     

       6
        
         src = fetchPypi {

     

       7
        
           inherit pname version;

     

       8
       +
           sha256 = "1g8dwafx4vx06isjkn28r3cwb0hw1bv67lgygaz34yk66lrzz1x5";

     

       9
        
         };

     

       10
        
       

     

       11
       +
         propagatedBuildInputs = [ blessings cwcwidth ]

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       12
        
           ++ lib.optionals (pythonOlder "3.5") [ typing ];

     

       13
        
       

     

       14
        
         checkInputs = [ mock pyte nose ];

+34

pkgs/development/python-modules/cwcwidth/default.nix

···

       1
       +
       { lib, buildPythonPackage, fetchPypi, cython, pytestCheckHook }:

     

       2
       +
       

     

       3
       +
       buildPythonPackage rec {

     

       4
       +
         pname = "cwcwidth";

     

       5
       +
         version = "0.1.4";

     

       6
       +
         format = "pyproject";

     

       7
       +
       

     

       8
       +
         src = fetchPypi {

     

       9
       +
           inherit pname version;

     

       10
       +
           sha256 = "1azrphpkcyggg38xvkfb9dpc4xmmm90p02kf8dkqd4d6j5w96aj8";

     

       11
       +
         };

     

       12
       +
       

     

       13
       +
         nativeBuildInputs = [ cython ];

     

       14
       +
       

     

       15
       +
         checkInputs = [ pytestCheckHook ];

     

       16
       +
         # Hack needed to make pytest + cython work

     

       17
       +
         # https://github.com/NixOS/nixpkgs/pull/82410#issuecomment-827186298

     

       18
       +
         preCheck = ''

     

       19
       +
           export HOME=$(mktemp -d)

     

       20
       +
           cp -r $TMP/$sourceRoot/tests $HOME

     

       21
       +
           pushd $HOME

     

       22
       +
         '';

     

       23
       +
         postCheck = "popd";

     

       24
       +
       

     

       25
       +
         pythonImportsCheck = [ "cwcwidth" ];

     

       26
       +
       

     

       27
       +
         meta = with lib; {

     

       28
       +
           description = "Python bindings for wc(s)width";

     

       29
       +
           homepage = "https://github.com/sebastinas/cwcwidth";

     

       30
       +
           changelog = "https://github.com/sebastinas/cwcwidth/blob/main/CHANGELOG.md";

     

       31
       +
           license = licenses.mit;

     

       32
       +
           maintainers = with maintainers; [ eduardosm ];

     

       33
       +
         };

     

       34
       +
       }

+42

pkgs/development/python-modules/humblewx/default.nix

···

       1
       +
       { lib

     

       2
       +
       , fetchFromGitHub

     

       3
       +
       , buildPythonPackage

     

       4
       +
       , wxPython_4_0

     

       5
       +
       , python3

     

       6
       +
       }:

     

       7
       +
       

     

       8
       +
       buildPythonPackage rec {

     

       9
       +
         pname = "humblewx";

     

       10
       +
         version = "0.2.2";

     

       11
       +
       

     

       12
       +
         src = fetchFromGitHub {

     

       13
       +
           owner = "thetimelineproj";

     

       14
       +
           repo = pname;

     

       15
       +
           rev = version;

     

       16
       +
           sha256 = "0fv8gwlbcj000qq34inbwgxf0xgibs590dsyqnw0mmyb7f1iq210";

     

       17
       +
         };

     

       18
       +
       

     

       19
       +
         # timeline is not compatible with wxPython_4_1. reported upstream

     

       20
       +
         propagatedBuildInputs = [ wxPython_4_0 ];

     

       21
       +
       

     

       22
       +
         checkPhase = ''

     

       23
       +
           runHook preCheck

     

       24
       +
           for i in examples/*; do

     

       25
       +
             ${python3.interpreter} $i

     

       26
       +
           done

     

       27
       +
           runHook postCheck

     

       28
       +
         '';

     

       29
       +
       

     

       30
       +
         # Unable to access the X Display, is $DISPLAY set properly?

     

       31
       +
         # would have to use nixos module tests, but it is not worth it

     

       32
       +
         doCheck = false;

     

       33
       +
       

     

       34
       +
         pythonImportsCheck = [ "humblewx" ];

     

       35
       +
       

     

       36
       +
         meta = {

     

       37
       +
           homepage = "https://github.com/thetimelineproj/humblewx";

     

       38
       +
           description = "Library that simplifies creating user interfaces with wxPython";

     

       39
       +
           license = lib.licenses.gpl3Only;

     

       40
       +
           maintainers = with lib.maintainers; [ davidak ];

     

       41
       +
         };

     

       42
       +
       }

+2 -2

pkgs/development/python-modules/pychannels/default.nix

···

       6
        
       

     

       7
        
       buildPythonPackage rec {

     

       8
        
         pname = "pychannels";

     

       9
       -
         version = "1.2.2";

     

       10
        
       

     

       11
        
         src = fetchFromGitHub {

     

       12
        
           owner = "fancybits";

     

       13
        
           repo = pname;

     

       14
        
           rev = version;

     

       15
       -
           sha256 = "0dqc0vhf6c5r3g7nfbpa668x6z2zxrznk6h907s6sxkq4sbqnhqf";

     

       16
        
         };

     

       17
        
       

     

       18
        
         propagatedBuildInputs = [ requests ];

···

       6
        
       

     

       7
        
       buildPythonPackage rec {

     

       8
        
         pname = "pychannels";

     

       9
       +
         version = "1.2.3";

     

       10
        
       

     

       11
        
         src = fetchFromGitHub {

     

       12
        
           owner = "fancybits";

     

       13
        
           repo = pname;

     

       14
        
           rev = version;

     

       15
       +
           sha256 = "sha256-E+VL4mJ2KxS5bJZc3Va+wvyVjT55LJz+1wHkxDRa85s=";

     

       16
        
         };

     

       17
        
       

     

       18
        
         propagatedBuildInputs = [ requests ];

+2 -2

pkgs/development/python-modules/pylast/default.nix

···

       11
        
       

     

       12
        
       buildPythonPackage rec {

     

       13
        
         pname = "pylast";

     

       14
       -
         version = "4.2.0";

     

       15
        
         disabled = pythonOlder "3.6";

     

       16
        
       

     

       17
        
         src = fetchPypi {

     

       18
        
           inherit pname version;

     

       19
       -
           sha256 = "sha256-w/mkAUUgj7L7Xv+nz1pI1TYKfihH3S3MbxaNQ4VtoH0=";

     

       20
        
         };

     

       21
        
       

     

       22
        
         nativeBuildInputs = [ setuptools-scm ];

···

       11
        
       

     

       12
        
       buildPythonPackage rec {

     

       13
        
         pname = "pylast";

     

       14
       +
         version = "4.2.1";

     

       15
        
         disabled = pythonOlder "3.6";

     

       16
        
       

     

       17
        
         src = fetchPypi {

     

       18
        
           inherit pname version;

     

       19
       +
           sha256 = "sha256-R1enQk6luuBiobMPDn5x1SXx7zUI/5c8dPtyWkmG/18=";

     

       20
        
         };

     

       21
        
       

     

       22
        
         nativeBuildInputs = [ setuptools-scm ];

+33

pkgs/development/python-modules/pysvg-py3/default.nix

···

       1
       +
       { lib

     

       2
       +
       , fetchFromGitHub

     

       3
       +
       , buildPythonPackage

     

       4
       +
       , python

     

       5
       +
       }:

     

       6
       +
       

     

       7
       +
       buildPythonPackage rec {

     

       8
       +
         pname = "pysvg-py3";

     

       9
       +
         version = "0.2.2-post3";

     

       10
       +
       

     

       11
       +
         src = fetchFromGitHub {

     

       12
       +
           owner = "alorence";

     

       13
       +
           repo = pname;

     

       14
       +
           rev = version;

     

       15
       +
           sha256 = "1slync0knpcjgl4xpym8w4249iy6vmrwbarpnbjzn9xca8g1h2f0";

     

       16
       +
         };

     

       17
       +
       

     

       18
       +
         checkPhase = ''

     

       19
       +
           runHook preCheck

     

       20
       +
           mkdir testoutput

     

       21
       +
           ${python.interpreter} sample/tutorial.py

     

       22
       +
           runHook postCheck

     

       23
       +
         '';

     

       24
       +
       

     

       25
       +
         pythonImportsCheck = [ "pysvg" ];

     

       26
       +
       

     

       27
       +
         meta = {

     

       28
       +
           homepage = "https://github.com/alorence/pysvg-py3";

     

       29
       +
           description = "Creating SVG with Python";

     

       30
       +
           license = lib.licenses.bsd2;

     

       31
       +
           maintainers = with lib.maintainers; [ davidak ];

     

       32
       +
         };

     

       33
       +
       }

+2 -2

pkgs/development/python-modules/slixmpp/default.nix

···

       13
        
       

     

       14
        
       buildPythonPackage rec {

     

       15
        
         pname = "slixmpp";

     

       16
       -
         version = "1.7.0";

     

       17
        
       

     

       18
        
         disabled = !isPy3k;

     

       19
        
       

     

       20
        
         src = fetchPypi {

     

       21
        
           inherit pname version;

     

       22
       -
           sha256 = "sha256-fy7sRKS7ih4JmjOW/noL8qJ1xWVpQLbBbObHnMwT3Bc=";

     

       23
        
         };

     

       24
        
       

     

       25
        
         patches = [

···

       13
        
       

     

       14
        
       buildPythonPackage rec {

     

       15
        
         pname = "slixmpp";

     

       16
       +
         version = "1.7.1";

     

       17
        
       

     

       18
        
         disabled = !isPy3k;

     

       19
        
       

     

       20
        
         src = fetchPypi {

     

       21
        
           inherit pname version;

     

       22
       +
           sha256 = "sha256-mvg23FdHJZeIZRcm8GLWmm9DDTBt29jmsUHB/smVSec=";

     

       23
        
         };

     

       24
        
       

     

       25
        
         patches = [

+18 -13

pkgs/development/tools/rust/cargo-binutils/default.nix

···

       5
        
         version = "0.3.3";

     

       6
        
       

     

       7
        
         # Upstream doesn't commit `Cargo.lock`, see https://github.com/rust-embedded/cargo-binutils/pull/99

     

       8
       -
         src = let

     

       9
       -
           repo = fetchFromGitHub {

     

       10
       -
             owner = "rust-embedded";

     

       11
       -
             repo = pname;

     

       12
       -
             rev = "v${version}";

     

       13
       -
             sha256 = "sha256-Dgn+f4aSsDSh+RC8yvt3ydkdtwib5jEVsnZkod5c7Vo=";

     

       14
       -
           };

     

       15
       -
         in runCommand "source" { } ''

     

       16
       -
           cp -R ${repo} $out

     

       17
       -
           chmod -R +w $out

     

       18
       -
           cp ${./Cargo.lock} $out/Cargo.lock

     

       19
       -
         '';

     

       0
        
       
     

       0
        
       
     

       20
        
       

     

       21
        
         cargoSha256 = "sha256-Zrl269PacPi81TrGTIDzmVndgGY5i5lYyspiOj43rpw=";

     

       22
        
       

     

       23
        
         meta = with lib; {

     

       24
       -
           description = "Cargo subcommands to invoke the LLVM tools shipped with the Rust toolchain";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       25
        
           homepage = "https://github.com/rust-embedded/cargo-binutils";

     

       26
        
           license = with licenses; [ asl20 mit ];

     

       27
        
           maintainers = with maintainers; [ stupremee ];

···

       5
        
         version = "0.3.3";

     

       6
        
       

     

       7
        
         # Upstream doesn't commit `Cargo.lock`, see https://github.com/rust-embedded/cargo-binutils/pull/99

     

       8
       +
         src =

     

       9
       +
           let

     

       10
       +
             repo = fetchFromGitHub {

     

       11
       +
               owner = "rust-embedded";

     

       12
       +
               repo = pname;

     

       13
       +
               rev = "v${version}";

     

       14
       +
               sha256 = "sha256-Dgn+f4aSsDSh+RC8yvt3ydkdtwib5jEVsnZkod5c7Vo=";

     

       15
       +
             };

     

       16
       +
           in

     

       17
       +
           runCommand "source" { } ''

     

       18
       +
             cp -R ${repo} $out

     

       19
       +
             chmod -R +w $out

     

       20
       +
             cp ${./Cargo.lock} $out/Cargo.lock

     

       21
       +
           '';

     

       22
        
       

     

       23
        
         cargoSha256 = "sha256-Zrl269PacPi81TrGTIDzmVndgGY5i5lYyspiOj43rpw=";

     

       24
        
       

     

       25
        
         meta = with lib; {

     

       26
       +
           description = "Cargo subcommands to invoke the LLVM tools shipped with the Rust toolchain.";

     

       27
       +
           longDescription = ''

     

       28
       +
             In order for this to work, you either need to run `rustup component add llvm-tools-preview` or install the `llvm-tools-preview` component using your Nix library (e.g. nixpkgs-mozilla, or rust-overlay)

     

       29
       +
           '';

     

       30
        
           homepage = "https://github.com/rust-embedded/cargo-binutils";

     

       31
        
           license = with licenses; [ asl20 mit ];

     

       32
        
           maintainers = with maintainers; [ stupremee ];

+1 -1

pkgs/games/assaultcube/default.nix

···

       67
        
           homepage = "https://assault.cubers.net";

     

       68
        
           maintainers = [ ];

     

       69
        
           platforms = platforms.linux; # should work on darwin with a little effort.

     

       70
       -
           license = lib.licenses.zlib;

     

       71
        
         };

     

       72
        
       }

···

       67
        
           homepage = "https://assault.cubers.net";

     

       68
        
           maintainers = [ ];

     

       69
        
           platforms = platforms.linux; # should work on darwin with a little effort.

     

       70
       +
           license = lib.licenses.unfree;

     

       71
        
         };

     

       72
        
       }

+15 -15

pkgs/os-specific/linux/kernel/hardened/patches.json

···

       1
        
       {

     

       2
        
           "4.14": {

     

       3
        
               "extra": "-hardened1",

     

       4
       -
               "name": "linux-hardened-4.14.231-hardened1.patch",

     

       5
       -
               "sha256": "0camacpjlix1ajx2z1krsv7j5m9g7vaikp2qsa43w3xxgms1slp6",

     

       6
       -
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.231-hardened1/linux-hardened-4.14.231-hardened1.patch"

     

       7
        
           },

     

       8
        
           "4.19": {

     

       9
        
               "extra": "-hardened1",

     

       10
       -
               "name": "linux-hardened-4.19.188-hardened1.patch",

     

       11
       -
               "sha256": "1l5hmfzkp9aajj48xny2khrg54501m57llykp6p3vpg9hwh19j1q",

     

       12
       -
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.188-hardened1/linux-hardened-4.19.188-hardened1.patch"

     

       13
        
           },

     

       14
        
           "5.10": {

     

       15
        
               "extra": "-hardened1",

     

       16
       -
               "name": "linux-hardened-5.10.32-hardened1.patch",

     

       17
       -
               "sha256": "0vl01f6kpb38qv9855x1c4fzih1xmfb1xby70dzfkp5bg53ms5r3",

     

       18
       -
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.32-hardened1/linux-hardened-5.10.32-hardened1.patch"

     

       19
        
           },

     

       20
        
           "5.11": {

     

       21
        
               "extra": "-hardened1",

     

       22
       -
               "name": "linux-hardened-5.11.16-hardened1.patch",

     

       23
       -
               "sha256": "1fxf1qcqrvgywxnyywsbav80ys0y4c9qg6s8ygmplyjvncd9005l",

     

       24
       -
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.16-hardened1/linux-hardened-5.11.16-hardened1.patch"

     

       25
        
           },

     

       26
        
           "5.4": {

     

       27
        
               "extra": "-hardened1",

     

       28
       -
               "name": "linux-hardened-5.4.114-hardened1.patch",

     

       29
       -
               "sha256": "0zbn9x59m6b62c9hjp47xkg1qk8a489nd99px2g4i24mnhgan0kf",

     

       30
       -
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.114-hardened1/linux-hardened-5.4.114-hardened1.patch"

     

       31
        
           }

     

       32
        
       }

···

       1
        
       {

     

       2
        
           "4.14": {

     

       3
        
               "extra": "-hardened1",

     

       4
       +
               "name": "linux-hardened-4.14.232-hardened1.patch",

     

       5
       +
               "sha256": "141bjr8z5gg5c9bwbq2krhpwzhs225g5465izgz38sls57dllll4",

     

       6
       +
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.232-hardened1/linux-hardened-4.14.232-hardened1.patch"

     

       7
        
           },

     

       8
        
           "4.19": {

     

       9
        
               "extra": "-hardened1",

     

       10
       +
               "name": "linux-hardened-4.19.190-hardened1.patch",

     

       11
       +
               "sha256": "111pxnnmajd1c7p51v99qc28dq7hrhji6ja0i5m46d2r8am1z4cz",

     

       12
       +
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.190-hardened1/linux-hardened-4.19.190-hardened1.patch"

     

       13
        
           },

     

       14
        
           "5.10": {

     

       15
        
               "extra": "-hardened1",

     

       16
       +
               "name": "linux-hardened-5.10.35-hardened1.patch",

     

       17
       +
               "sha256": "133k9h187jpkyfqrd66v4k0z3l3gg6r0g4x8nsic9sarapdd62v7",

     

       18
       +
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.35-hardened1/linux-hardened-5.10.35-hardened1.patch"

     

       19
        
           },

     

       20
        
           "5.11": {

     

       21
        
               "extra": "-hardened1",

     

       22
       +
               "name": "linux-hardened-5.11.19-hardened1.patch",

     

       23
       +
               "sha256": "16czmg41nijl7zaahb4ggi8z7hizc0qsqg3az8vzll5kvzzr313f",

     

       24
       +
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.19-hardened1/linux-hardened-5.11.19-hardened1.patch"

     

       25
        
           },

     

       26
        
           "5.4": {

     

       27
        
               "extra": "-hardened1",

     

       28
       +
               "name": "linux-hardened-5.4.117-hardened1.patch",

     

       29
       +
               "sha256": "0b9mfw49yrdgsj9804nh0qxzj49z2xb1jvxhvdxpm9yjlnyw85bv",

     

       30
       +
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.117-hardened1/linux-hardened-5.4.117-hardened1.patch"

     

       31
        
           }

     

       32
        
       }

+2 -2

pkgs/os-specific/linux/kernel/linux-4.14.nix

···

       3
        
       with lib;

     

       4
        
       

     

       5
        
       buildLinux (args // rec {

     

       6
       -
         version = "4.14.231";

     

       7
        
       

     

       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
        
       

     

       14
        
         src = fetchurl {

     

       15
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       16
       -
           sha256 = "10k63vwibygdd6gzs4r6rncqqa0qf8cbnqznhbfsi41lxsnpjfsp";

     

       17
        
         };

     

       18
        
       

     

       19
        
         kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ];

···

       3
        
       with lib;

     

       4
        
       

     

       5
        
       buildLinux (args // rec {

     

       6
       +
         version = "4.14.232";

     

       7
        
       

     

       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
        
       

     

       14
        
         src = fetchurl {

     

       15
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       16
       +
           sha256 = "0sa3sz7bznlhijd0iwv37nyrrnw34iq6dq1bqr6cj2wpyrhr7h8x";

     

       17
        
         };

     

       18
        
       

     

       19
        
         kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ];

+2 -2

pkgs/os-specific/linux/kernel/linux-4.19.nix

···

       3
        
       with lib;

     

       4
        
       

     

       5
        
       buildLinux (args // rec {

     

       6
       -
         version = "4.19.188";

     

       7
        
       

     

       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
        
       

     

       14
        
         src = fetchurl {

     

       15
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       16
       -
           sha256 = "0xq00mwgclk89bk5jpmncjnz7vsq353qrnc0cjp0n9mi4vqg375h";

     

       17
        
         };

     

       18
        
       

     

       19
        
         kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ];

···

       3
        
       with lib;

     

       4
        
       

     

       5
        
       buildLinux (args // rec {

     

       6
       +
         version = "4.19.190";

     

       7
        
       

     

       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
        
       

     

       14
        
         src = fetchurl {

     

       15
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       16
       +
           sha256 = "0pf8py0id0r8wzr5050bik1sbhl8gsznnr5bvcmrs4jkhpp2m73g";

     

       17
        
         };

     

       18
        
       

     

       19
        
         kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ];

+2 -2

pkgs/os-specific/linux/kernel/linux-4.4.nix

···

       1
        
       { buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args:

     

       2
        
       

     

       3
        
       buildLinux (args // rec {

     

       4
       -
         version = "4.4.267";

     

       5
        
         extraMeta.branch = "4.4";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       9
       -
           sha256 = "1qk629fsl1glr0h1hxami3f4ivgl58iqsnw43slvn1yc91cb7ws4";

     

       10
        
         };

     

       11
        
       

     

       12
        
         kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ];

···

       1
        
       { buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args:

     

       2
        
       

     

       3
        
       buildLinux (args // rec {

     

       4
       +
         version = "4.4.268";

     

       5
        
         extraMeta.branch = "4.4";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       9
       +
           sha256 = "1srk08kaxq5jjlqx804cgjffhcsrdkv3idh8ipagl6v2w4kas5v8";

     

       10
        
         };

     

       11
        
       

     

       12
        
         kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ];

+2 -2

pkgs/os-specific/linux/kernel/linux-4.9.nix

···

       1
        
       { buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args:

     

       2
        
       

     

       3
        
       buildLinux (args // rec {

     

       4
       -
         version = "4.9.267";

     

       5
        
         extraMeta.branch = "4.9";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       9
       -
           sha256 = "0q0a49b3wsxk9mqyy8b55lr1gmiqxjpqh2nlhj4xwcfzd7z9lfwq";

     

       10
        
         };

     

       11
        
       

     

       12
        
         kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ];

···

       1
        
       { buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args:

     

       2
        
       

     

       3
        
       buildLinux (args // rec {

     

       4
       +
         version = "4.9.268";

     

       5
        
         extraMeta.branch = "4.9";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       9
       +
           sha256 = "0aknrlf5q0dsqib8c9klmf5c60dy7hg2zksb020qvyrp077gcrjv";

     

       10
        
         };

     

       11
        
       

     

       12
        
         kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ];

+2 -2

pkgs/os-specific/linux/kernel/linux-5.10.nix

···

       3
        
       with lib;

     

       4
        
       

     

       5
        
       buildLinux (args // rec {

     

       6
       -
         version = "5.10.32";

     

       7
        
       

     

       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
        
       

     

       14
        
         src = fetchurl {

     

       15
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       16
       -
           sha256 = "1fnp0wyiswg8q4w89ssm1fz1ryfc1567fx08bz3fmf2cdqr8wkv4";

     

       17
        
         };

     

       18
        
       

     

       19
        
         kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ];

···

       3
        
       with lib;

     

       4
        
       

     

       5
        
       buildLinux (args // rec {

     

       6
       +
         version = "5.10.35";

     

       7
        
       

     

       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
        
       

     

       14
        
         src = fetchurl {

     

       15
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       16
       +
           sha256 = "1zcqsjzqgcvlhkjwhzs6sxgbhzkfg898pbisivjqfymp8nfs2dxc";

     

       17
        
         };

     

       18
        
       

     

       19
        
         kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ];

+2 -2

pkgs/os-specific/linux/kernel/linux-5.11.nix

···

       3
        
       with lib;

     

       4
        
       

     

       5
        
       buildLinux (args // rec {

     

       6
       -
         version = "5.11.16";

     

       7
        
       

     

       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
        
       

     

       14
        
         src = fetchurl {

     

       15
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       16
       -
           sha256 = "0hqgai4r40xxlfqp1paxhn2g4i4yqvi1k473dddcxjrhs60kc5i1";

     

       17
        
         };

     

       18
        
       

     

       19
        
         kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_11 ];

···

       3
        
       with lib;

     

       4
        
       

     

       5
        
       buildLinux (args // rec {

     

       6
       +
         version = "5.11.19";

     

       7
        
       

     

       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
        
       

     

       14
        
         src = fetchurl {

     

       15
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       16
       +
           sha256 = "0jrb8wbxj0dadyadggcn49hlxzxgz8mz8xr0ckgbnnvb8snikvjs";

     

       17
        
         };

     

       18
        
       

     

       19
        
         kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_11 ];

+2 -2

pkgs/os-specific/linux/kernel/linux-5.4.nix

···

       3
        
       with lib;

     

       4
        
       

     

       5
        
       buildLinux (args // rec {

     

       6
       -
         version = "5.4.114";

     

       7
        
       

     

       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
        
       

     

       14
        
         src = fetchurl {

     

       15
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       16
       -
           sha256 = "0mwmvvz817zgxalb2xcx0i49smjag6j81vmqxp2kpwjqrf3z165y";

     

       17
        
         };

     

       18
        
       

     

       19
        
         kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ];

···

       3
        
       with lib;

     

       4
        
       

     

       5
        
       buildLinux (args // rec {

     

       6
       +
         version = "5.4.117";

     

       7
        
       

     

       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
        
       

     

       14
        
         src = fetchurl {

     

       15
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       16
       +
           sha256 = "0w679qymqh8dlb1mh2vxr382m1pzxdjwlp3bqzjr4043fmbrp62f";

     

       17
        
         };

     

       18
        
       

     

       19
        
         kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ];

+2 -2

pkgs/os-specific/linux/kernel/linux-libre.nix

···

       1
        
       { stdenv, lib, fetchsvn, linux

     

       2
        
       , scripts ? fetchsvn {

     

       3
        
           url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";

     

       4
       -
           rev = "17990";

     

       5
       -
           sha256 = "1hras4018lgvql1zxw26fzcvk0w1xh6pyh3kmhxxh23k61zl83zk";

     

       6
        
         }

     

       7
        
       , ...

     

       8
        
       }:

···

       1
        
       { stdenv, lib, fetchsvn, linux

     

       2
        
       , scripts ? fetchsvn {

     

       3
        
           url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";

     

       4
       +
           rev = "18063";

     

       5
       +
           sha256 = "1mmijqra6sq2pcc8yhh8m4k6x0dvhnq4xxzm1qs7kdznj2zwr8is";

     

       6
        
         }

     

       7
        
       , ...

     

       8
        
       }:

+2 -2

pkgs/os-specific/linux/kernel/linux-lqx.nix

···

       1
        
       { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:

     

       2
        
       

     

       3
        
       let

     

       4
       -
         version = "5.11.18";

     

       5
        
         suffix = "lqx1";

     

       6
        
       in

     

       7
        
       

     
···

       14
        
           owner = "zen-kernel";

     

       15
        
           repo = "zen-kernel";

     

       16
        
           rev = "v${version}-${suffix}";

     

       17
       -
           sha256 = "0fz0s6bdcvbzy1149acqkq3aqg481dwiq85wh7ii1hx6p1gbsx71";

     

       18
        
         };

     

       19
        
       

     

       20
        
         extraMeta = {

···

       1
        
       { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:

     

       2
        
       

     

       3
        
       let

     

       4
       +
         version = "5.11.19";

     

       5
        
         suffix = "lqx1";

     

       6
        
       in

     

       7
        
       

     
···

       14
        
           owner = "zen-kernel";

     

       15
        
           repo = "zen-kernel";

     

       16
        
           rev = "v${version}-${suffix}";

     

       17
       +
           sha256 = "17gdlkixsy68j6c7lpkkk242x71rqj78hpqg3kp01fckj633za5n";

     

       18
        
         };

     

       19
        
       

     

       20
        
         extraMeta = {

+2 -2

pkgs/os-specific/linux/kernel/linux-rt-5.10.nix

···

       6
        
       , ... } @ args:

     

       7
        
       

     

       8
        
       let

     

       9
       -
         version = "5.10.30-rt37"; # updated by ./update-rt.sh

     

       10
        
         branch = lib.versions.majorMinor version;

     

       11
        
         kversion = builtins.elemAt (lib.splitString "-" version) 0;

     

       12
        
       in buildLinux (args // {

     
···

       25
        
           name = "rt";

     

       26
        
           patch = fetchurl {

     

       27
        
             url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";

     

       28
       -
             sha256 = "1jibjfmjyn90n5jz5vq056n9xfzn9p8g9fsv7nmj5mfxxm4qhjal";

     

       29
        
           };

     

       30
        
         }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;

     

       31

···

       6
        
       , ... } @ args:

     

       7
        
       

     

       8
        
       let

     

       9
       +
         version = "5.10.30-rt38"; # updated by ./update-rt.sh

     

       10
        
         branch = lib.versions.majorMinor version;

     

       11
        
         kversion = builtins.elemAt (lib.splitString "-" version) 0;

     

       12
        
       in buildLinux (args // {

     
···

       25
        
           name = "rt";

     

       26
        
           patch = fetchurl {

     

       27
        
             url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";

     

       28
       +
             sha256 = "0f8wcs0y1qx3kqsan8g7bh1my2yc77k6d1g3q12nfxvbmlgs766n";

     

       29
        
           };

     

       30
        
         }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;

     

       31

+3 -3

pkgs/os-specific/linux/kernel/linux-rt-5.4.nix

···

       6
        
       , ... } @ args:

     

       7
        
       

     

       8
        
       let

     

       9
       -
         version = "5.4.109-rt56"; # updated by ./update-rt.sh

     

       10
        
         branch = lib.versions.majorMinor version;

     

       11
        
         kversion = builtins.elemAt (lib.splitString "-" version) 0;

     

       12
        
       in buildLinux (args // {

     
···

       14
        
       

     

       15
        
         src = fetchurl {

     

       16
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";

     

       17
       -
           sha256 = "1vmpc6yrr2zm4m3naflwik5111jr8hy0mnyddwk31l0p4xbg8smc";

     

       18
        
         };

     

       19
        
       

     

       20
        
         kernelPatches = let rt-patch = {

     

       21
        
           name = "rt";

     

       22
        
           patch = fetchurl {

     

       23
        
             url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";

     

       24
       -
             sha256 = "08cg8b7mwihs8zgdh0jwi8hrn3hnf9j0jyplsyc7644wd6mqby4a";

     

       25
        
           };

     

       26
        
         }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;

     

       27

···

       6
        
       , ... } @ args:

     

       7
        
       

     

       8
        
       let

     

       9
       +
         version = "5.4.115-rt57"; # updated by ./update-rt.sh

     

       10
        
         branch = lib.versions.majorMinor version;

     

       11
        
         kversion = builtins.elemAt (lib.splitString "-" version) 0;

     

       12
        
       in buildLinux (args // {

     
···

       14
        
       

     

       15
        
         src = fetchurl {

     

       16
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";

     

       17
       +
           sha256 = "1llxk04vlpi7a4ca2f5vlcxfn68n8yhmsar3hsl259i7hms28isv";

     

       18
        
         };

     

       19
        
       

     

       20
        
         kernelPatches = let rt-patch = {

     

       21
        
           name = "rt";

     

       22
        
           patch = fetchurl {

     

       23
        
             url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";

     

       24
       +
             sha256 = "1xh7xi27q58njhfayi2lnk4id7hnlklkgh2zx012gxv4ari76g0k";

     

       25
        
           };

     

       26
        
         }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;

     

       27

+2 -2

pkgs/servers/atlassian/confluence.nix

···

       8
        
       

     

       9
        
       stdenvNoCC.mkDerivation rec {

     

       10
        
         pname = "atlassian-confluence";

     

       11
       -
         version = "7.10.1";

     

       12
        
       

     

       13
        
         src = fetchurl {

     

       14
        
           url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz";

     

       15
       -
           sha256 = "sha256-ScE0UXmoxHb7HOJhSfOLXj3Wb3/XitFuOR36Iktmgxk=";

     

       16
        
         };

     

       17
        
       

     

       18
        
         buildPhase = ''

···

       8
        
       

     

       9
        
       stdenvNoCC.mkDerivation rec {

     

       10
        
         pname = "atlassian-confluence";

     

       11
       +
         version = "7.11.0";

     

       12
        
       

     

       13
        
         src = fetchurl {

     

       14
        
           url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz";

     

       15
       +
           sha256 = "sha256-/D/fMg+WRkGGV4NG73gvVDZwwi/8BB0w6IWK/OQ3caA=";

     

       16
        
         };

     

       17
        
       

     

       18
        
         buildPhase = ''

+2 -2

pkgs/servers/atlassian/jira.nix

···

       8
        
       

     

       9
        
       stdenv.mkDerivation rec {

     

       10
        
         pname = "atlassian-jira";

     

       11
       -
         version = "8.14.0";

     

       12
        
       

     

       13
        
         src = fetchurl {

     

       14
        
           url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";

     

       15
       -
           sha256 = "12dm0sasw98ywd074rjd9hnbymvy8z16bicjxfxqz91n1y13732i";

     

       16
        
         };

     

       17
        
       

     

       18
        
         buildPhase = ''

···

       8
        
       

     

       9
        
       stdenv.mkDerivation rec {

     

       10
        
         pname = "atlassian-jira";

     

       11
       +
         version = "8.14.1";

     

       12
        
       

     

       13
        
         src = fetchurl {

     

       14
        
           url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";

     

       15
       +
           sha256 = "sha256-AtBkGODC8x25GQENRSRiptUvDIcHGg9JnqVnDxXzmmQ=";

     

       16
        
         };

     

       17
        
       

     

       18
        
         buildPhase = ''

+3 -3

pkgs/tools/misc/dua/default.nix

···

       2
        
       

     

       3
        
       rustPlatform.buildRustPackage rec {

     

       4
        
         pname = "dua";

     

       5
       -
         version = "2.11.2";

     

       6
        
       

     

       7
        
         buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

     

       8
        
       

     
···

       10
        
           owner = "Byron";

     

       11
        
           repo = "dua-cli";

     

       12
        
           rev = "v${version}";

     

       13
       -
           sha256 = "sha256-sT4hg5MC6xuhSKeNxaVY9vOlMEx23uwxgK6UMLO4kVs=";

     

       14
        
           # Remove unicode file names which leads to different checksums on HFS+

     

       15
        
           # vs. other filesystems because of unicode normalisation.

     

       16
        
           extraPostFetch = ''

     
···

       18
        
           '';

     

       19
        
         };

     

       20
        
       

     

       21
       -
         cargoSha256 = "sha256-DOotIN8XScgHR9L6aFgky2B18piGIKfLWx1GTdYnCB0=";

     

       22
        
       

     

       23
        
         doCheck = false;

     

       24

···

       2
        
       

     

       3
        
       rustPlatform.buildRustPackage rec {

     

       4
        
         pname = "dua";

     

       5
       +
         version = "2.11.3";

     

       6
        
       

     

       7
        
         buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

     

       8
        
       

     
···

       10
        
           owner = "Byron";

     

       11
        
           repo = "dua-cli";

     

       12
        
           rev = "v${version}";

     

       13
       +
           sha256 = "sha256-rwbeWjYhAgZhQDg1/Pux08Kw+7NQG7dJlhZnwlaEjJ4=";

     

       14
        
           # Remove unicode file names which leads to different checksums on HFS+

     

       15
        
           # vs. other filesystems because of unicode normalisation.

     

       16
        
           extraPostFetch = ''

     
···

       18
        
           '';

     

       19
        
         };

     

       20
        
       

     

       21
       +
         cargoSha256 = "sha256-ta5mHTfSs72HUz3ezZhVvU61ECvyWY3Sba7/UoJGc8U=";

     

       22
        
       

     

       23
        
         doCheck = false;

     

       24

+3 -3

pkgs/tools/misc/ffsend/default.nix

···

       17
        
       

     

       18
        
       buildRustPackage rec {

     

       19
        
         pname = "ffsend";

     

       20
       -
         version = "0.2.71";

     

       21
        
       

     

       22
        
         src = fetchFromGitLab {

     

       23
        
           owner = "timvisee";

     

       24
        
           repo = "ffsend";

     

       25
        
           rev = "v${version}";

     

       26
       -
           sha256 = "sha256-dXFnM8085XVzUwk1e3SoO+O+z9lJ40htJzHBGRQ95XY=";

     

       27
        
         };

     

       28
        
       

     

       29
       -
         cargoSha256 = "sha256-VwxIH/n1DjZsMOLAREclqanb4q7QEOZ35KWWciyrnyQ=";

     

       30
        
       

     

       31
        
         nativeBuildInputs = [ cmake pkg-config installShellFiles ];

     

       32
        
         buildInputs =

···

       17
        
       

     

       18
        
       buildRustPackage rec {

     

       19
        
         pname = "ffsend";

     

       20
       +
         version = "0.2.72";

     

       21
        
       

     

       22
        
         src = fetchFromGitLab {

     

       23
        
           owner = "timvisee";

     

       24
        
           repo = "ffsend";

     

       25
        
           rev = "v${version}";

     

       26
       +
           sha256 = "sha256-YEmEaf0ob2ulmQghwDYi0RtGuTdRHCoLdPnuVjxvlxE=";

     

       27
        
         };

     

       28
        
       

     

       29
       +
         cargoSha256 = "sha256-mcWQzfMc2cJjp0EFcfG7SAM70ItwEC/N13UDiRiI3ys=";

     

       30
        
       

     

       31
        
         nativeBuildInputs = [ cmake pkg-config installShellFiles ];

     

       32
        
         buildInputs =

+12 -8

pkgs/tools/package-management/createrepo_c/default.nix

···

       1
       -
       { lib, stdenv, fetchFromGitHub, cmake, pkg-config, bzip2, expat, glib, curl, libxml2, python3, rpm, openssl, sqlite, file, xz, pcre, bash-completion }:

     

       0
        
       
     

       0
        
       
     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "createrepo_c";

     

       5
       -
         version = "0.11.1";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner  = "rpm-software-management";

     

       9
        
           repo   = "createrepo_c";

     

       10
        
           rev    = version;

     

       11
       -
           sha256 = "0cmysc7gdd2czagl4drfh9gin6aa2847vgi30a3p0cfqvczf9cm6";

     

       12
        
         };

     

       13
        
       

     

       14
        
         patches = [

     

       0
        
       
     

       15
        
           ./fix-bash-completion-path.patch

     

       0
        
       
     

       16
        
           ./fix-python-install-path.patch

     

       17
        
         ];

     

       18
        
       

     
···

       23
        
             --replace "@PYTHON_INSTALL_DIR@" "$out/${python3.sitePackages}"

     

       24
        
         '';

     

       25
        
       

     

       26
       -
         nativeBuildInputs = [ cmake pkg-config ];

     

       27
        
       

     

       28
       -
         buildInputs = [ bzip2 expat glib curl libxml2 python3 rpm openssl sqlite file xz pcre bash-completion ];

     

       29
        
       

     

       30
        
         meta = with lib; {

     

       31
        
           description = "C implementation of createrepo";

     

       32
       -
           homepage    = "http://rpm-software-management.github.io/createrepo_c/";

     

       33
       -
           license     = licenses.gpl2;

     

       34
       -
           platforms   = platforms.linux;

     

       35
        
           maintainers = with maintainers; [ copumpkin ];

     

       36
        
         };

     

       37
        
       }

···

       1
       +
       { lib, stdenv, fetchFromGitHub, cmake, pkg-config, bzip2, expat, glib, curl, libxml2, python3, rpm

     

       2
       +
       , openssl, sqlite, file, xz, pcre, bash-completion, zstd, zchunk, libmodulemd

     

       3
       +
       }:

     

       4
        
       

     

       5
        
       stdenv.mkDerivation rec {

     

       6
        
         pname = "createrepo_c";

     

       7
       +
         version = "0.17.1";

     

       8
        
       

     

       9
        
         src = fetchFromGitHub {

     

       10
        
           owner  = "rpm-software-management";

     

       11
        
           repo   = "createrepo_c";

     

       12
        
           rev    = version;

     

       13
       +
           sha256 = "G2xioH9XWntHFmUfTN2s2mdtIqgTTLKr5jZflwpaC8Q=";

     

       14
        
         };

     

       15
        
       

     

       16
        
         patches = [

     

       17
       +
           # Use the output directory to install the bash completions.

     

       18
        
           ./fix-bash-completion-path.patch

     

       19
       +
           # Use the output directory to install the python modules.

     

       20
        
           ./fix-python-install-path.patch

     

       21
        
         ];

     

       22
        
       

     
···

       27
        
             --replace "@PYTHON_INSTALL_DIR@" "$out/${python3.sitePackages}"

     

       28
        
         '';

     

       29
        
       

     

       30
       +
         nativeBuildInputs = [ cmake pkg-config rpm ];

     

       31
        
       

     

       32
       +
         buildInputs = [ bzip2 expat glib curl libxml2 python3 openssl sqlite file xz pcre bash-completion zstd zchunk libmodulemd ];

     

       33
        
       

     

       34
        
         meta = with lib; {

     

       35
        
           description = "C implementation of createrepo";

     

       36
       +
           homepage    = "https://rpm-software-management.github.io/createrepo_c/";

     

       37
       +
           license     = licenses.gpl2Plus;

     

       38
       +
           platforms   = platforms.unix;

     

       39
        
           maintainers = with maintainers; [ copumpkin ];

     

       40
        
         };

     

       41
        
       }

+11 -11

pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch

···

       1
       -
       --- createrepo_c-0.10.0-src.orig/CMakeLists.txt	2017-03-19 11:01:02.703173617 +0100

     

       2
       -
       +++ createrepo_c-0.10.0-src/CMakeLists.txt	2017-03-19 11:02:38.617448248 +0100

     

       3
       -
       @@ -100,7 +100,7 @@

     

       4
       -
        

     

       5
       -
        pkg_check_modules(BASHCOMP bash-completion)

     

       6
       -
        if (BASHCOMP_FOUND)

     

       7
       -
       -    execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=completionsdir bash-completion OUTPUT_VARIABLE BASHCOMP_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)

     

       8
       -
       +    SET(BASHCOMP_DIR "@BASHCOMP_DIR@")

     

       9
       -
            message("Bash completion directory: ${BASHCOMP_DIR}")

     

       10
       -
            INSTALL(FILES createrepo_c.bash DESTINATION ${BASHCOMP_DIR} RENAME createrepo_c)

     

       11
       -
            INSTALL(CODE "

···

       1
       +
       --- a/CMakeLists.txt

     

       2
       +
       +++ b/CMakeLists.txt

     

       3
       +
       @@ -117,7 +117,7 @@ OPTION(ENABLE_BASHCOMP "Install Bash autocompletions?" ON)

     

       4
       +
        IF (ENABLE_BASHCOMP)

     

       5
       +
            pkg_check_modules(BASHCOMP bash-completion)

     

       6
       +
            IF (BASHCOMP_FOUND)

     

       7
       +
       -        execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=completionsdir bash-completion OUTPUT_VARIABLE BASHCOMP_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)

     

       8
       +
       +        SET(BASHCOMP_DIR "@BASHCOMP_DIR@")

     

       9
       +
                message("Bash completion directory: ${BASHCOMP_DIR}")

     

       10
       +
                INSTALL(FILES createrepo_c.bash DESTINATION ${BASHCOMP_DIR} RENAME createrepo_c)

     

       11
       +
                INSTALL(CODE "

+7 -7

pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch

···

       1
       -
       --- createrepo_c-0.10.0-src.orig/src/python/CMakeLists.txt	2017-03-19 10:50:33.796342953 +0100

     

       2
       -
       +++ createrepo_c-0.10.0-src/src/python/CMakeLists.txt	2017-03-19 10:53:51.207580073 +0100

     

       3
       -
       @@ -19,7 +19,7 @@

     

       4
       -
            FIND_PACKAGE(PythonInterp 3.0 REQUIRED)

     

       5
       -
        endif()

     

       6
       -
        

     

       7
        
       -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)

     

       8
        
       +SET(PYTHON_INSTALL_DIR "@PYTHON_INSTALL_DIR@")

     

       9
        
        INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH})

     

       10
       -
        

     

       11
        
        MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}")

···

       1
       +
       --- a/src/python/CMakeLists.txt

     

       2
       +
       +++ b/src/python/CMakeLists.txt

     

       3
       +
       @@ -14,7 +14,7 @@ if (NOT SKBUILD)

     

       4
       +
            FIND_PACKAGE(PythonLibs 3 REQUIRED)

     

       5
       +
        endif (NOT SKBUILD)

     

       6
       +
       

     

       7
        
       -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)

     

       8
        
       +SET(PYTHON_INSTALL_DIR "@PYTHON_INSTALL_DIR@")

     

       9
        
        INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH})

     

       10
       +
       

     

       11
        
        MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}")

+4 -4

pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix

···

       10
        
       

     

       11
        
       stdenv.mkDerivation rec {

     

       12
        
         pname = "google-compute-engine-oslogin";

     

       13
       -
         version = "20200507.00";

     

       14
        
       

     

       15
        
         src = fetchFromGitHub {

     

       16
        
           owner = "GoogleCloudPlatform";

     

       17
        
           repo = "guest-oslogin";

     

       18
        
           rev = version;

     

       19
       -
           sha256 = "1np8c96sm29pwnxykc0id8kkgalhw576g43fgi1y936sr2hfvx3v";

     

       20
        
         };

     

       21
        
       

     

       22
        
         postPatch = ''

     
···

       28
        
       

     

       29
        
         buildInputs = [ curl.dev pam ];

     

       30
        
       

     

       31
       -
         NIX_CFLAGS_COMPILE="-I${json_c.dev}/include/json-c";

     

       32
       -
         NIX_CFLAGS_LINK="-L${json_c}/lib";

     

       33
        
       

     

       34
        
         makeFlags = [

     

       35
        
           "VERSION=${version}"

···

       10
        
       

     

       11
        
       stdenv.mkDerivation rec {

     

       12
        
         pname = "google-compute-engine-oslogin";

     

       13
       +
         version = "20210429.00";

     

       14
        
       

     

       15
        
         src = fetchFromGitHub {

     

       16
        
           owner = "GoogleCloudPlatform";

     

       17
        
           repo = "guest-oslogin";

     

       18
        
           rev = version;

     

       19
       +
           sha256 = "eHAg9K5oxcygEzqaac81jSFHF+zsW6uB7q2Kfo9hSrA=";

     

       20
        
         };

     

       21
        
       

     

       22
        
         postPatch = ''

     
···

       28
        
       

     

       29
        
         buildInputs = [ curl.dev pam ];

     

       30
        
       

     

       31
       +
         NIX_CFLAGS_COMPILE = "-I${json_c.dev}/include/json-c";

     

       32
       +
         NIX_CFLAGS_LINK = "-L${json_c}/lib";

     

       33
        
       

     

       34
        
         makeFlags = [

     

       35
        
           "VERSION=${version}"

+6

pkgs/top-level/all-packages.nix

···

       4155
        
           inherit (darwin.apple_sdk.frameworks) AppKit Security;

     

       4156
        
         };

     

       4157
        
       

     

       0
        
       
     

       0
        
       
     

       4158
        
         tsm-client = callPackage ../tools/backup/tsm-client { jdk8 = null; };

     

       4159
        
         tsm-client-withGui = callPackage ../tools/backup/tsm-client { };

     

       4160
        
       

     
···

       13295
        
       

     

       13296
        
         ninja = callPackage ../development/tools/build-managers/ninja { };

     

       13297
        
       

     

       0
        
       
     

       0
        
       
     

       13298
        
         gn = callPackage ../development/tools/build-managers/gn { };

     

       13299
        
       

     

       13300
        
         nixbang = callPackage ../development/tools/misc/nixbang {

     
···

       22417
        
         bviplus = callPackage ../applications/editors/bviplus { };

     

       22418
        
       

     

       22419
        
         caerbannog = callPackage ../applications/misc/caerbannog { };

     

       0
        
       
     

       0
        
       
     

       22420
        
       

     

       22421
        
         cage = callPackage ../applications/window-managers/cage { };

     

       22422

···

       4155
        
           inherit (darwin.apple_sdk.frameworks) AppKit Security;

     

       4156
        
         };

     

       4157
        
       

     

       4158
       +
         timeline = callPackage ../applications/office/timeline/default.nix { };

     

       4159
       +
       

     

       4160
        
         tsm-client = callPackage ../tools/backup/tsm-client { jdk8 = null; };

     

       4161
        
         tsm-client-withGui = callPackage ../tools/backup/tsm-client { };

     

       4162
        
       

     
···

       13297
        
       

     

       13298
        
         ninja = callPackage ../development/tools/build-managers/ninja { };

     

       13299
        
       

     

       13300
       +
         nimbo = with python3Packages; callPackage ../applications/misc/nimbo { };

     

       13301
       +
       

     

       13302
        
         gn = callPackage ../development/tools/build-managers/gn { };

     

       13303
        
       

     

       13304
        
         nixbang = callPackage ../development/tools/misc/nixbang {

     
···

       22421
        
         bviplus = callPackage ../applications/editors/bviplus { };

     

       22422
        
       

     

       22423
        
         caerbannog = callPackage ../applications/misc/caerbannog { };

     

       22424
       +
       

     

       22425
       +
         cardboard = callPackage ../applications/window-managers/cardboard { };

     

       22426
        
       

     

       22427
        
         cage = callPackage ../applications/window-managers/cage { };

     

       22428

+6

pkgs/top-level/python-packages.nix

···

       1631
        
       

     

       1632
        
         cvxpy = callPackage ../development/python-modules/cvxpy { };

     

       1633
        
       

     

       0
        
       
     

       0
        
       
     

       1634
        
         cx_Freeze = callPackage ../development/python-modules/cx_freeze { };

     

       1635
        
       

     

       1636
        
         cx_oracle = callPackage ../development/python-modules/cx_oracle { };

     
···

       3150
        
         humanfriendly = callPackage ../development/python-modules/humanfriendly { };

     

       3151
        
       

     

       3152
        
         humanize = callPackage ../development/python-modules/humanize { };

     

       0
        
       
     

       0
        
       
     

       3153
        
       

     

       3154
        
         hupper = callPackage ../development/python-modules/hupper { };

     

       3155
        
       

     
···

       6227
        
         pystray = callPackage ../development/python-modules/pystray { };

     

       6228
        
       

     

       6229
        
         py_stringmatching = callPackage ../development/python-modules/py_stringmatching { };

     

       0
        
       
     

       0
        
       
     

       6230
        
       

     

       6231
        
         pysvn = callPackage ../development/python-modules/pysvn {

     

       6232
        
           inherit (pkgs) bash subversion apr aprutil expat neon openssl;

···

       1631
        
       

     

       1632
        
         cvxpy = callPackage ../development/python-modules/cvxpy { };

     

       1633
        
       

     

       1634
       +
         cwcwidth = callPackage ../development/python-modules/cwcwidth { };

     

       1635
       +
       

     

       1636
        
         cx_Freeze = callPackage ../development/python-modules/cx_freeze { };

     

       1637
        
       

     

       1638
        
         cx_oracle = callPackage ../development/python-modules/cx_oracle { };

     
···

       3152
        
         humanfriendly = callPackage ../development/python-modules/humanfriendly { };

     

       3153
        
       

     

       3154
        
         humanize = callPackage ../development/python-modules/humanize { };

     

       3155
       +
       

     

       3156
       +
         humblewx = callPackage ../development/python-modules/humblewx { };

     

       3157
        
       

     

       3158
        
         hupper = callPackage ../development/python-modules/hupper { };

     

       3159
        
       

     
···

       6231
        
         pystray = callPackage ../development/python-modules/pystray { };

     

       6232
        
       

     

       6233
        
         py_stringmatching = callPackage ../development/python-modules/py_stringmatching { };

     

       6234
       +
       

     

       6235
       +
         pysvg-py3 = callPackage ../development/python-modules/pysvg-py3 { };

     

       6236
        
       

     

       6237
        
         pysvn = callPackage ../development/python-modules/pysvn {

     

       6238
        
           inherit (pkgs) bash subversion apr aprutil expat neon openssl;