commit 2d204edb98691385aa0cf29376f44d72837d4eb7 · pyrox.dev/nixpkgs

+1 -1

.github/workflows/backport.yml

···

       12
       12
        
               with:

     

       13
       13
        
                 ref: ${{ github.event.pull_request.head.sha }}

     

       14
       14
        
             - name: Create backport PRs

     

       15
       15
       -
               uses: zeebe-io/backport-action@v0.0.6

     

       15
       15
       +
               uses: zeebe-io/backport-action@v0.0.7

     

       16
       16
        
               with:

     

       17
       17
        
                 # Config README: https://github.com/zeebe-io/backport-action#backport-action

     

       18
       18
        
                 github_token: ${{ secrets.GITHUB_TOKEN }}

+1

nixos/modules/module-list.nix

···

       584
       584
        
         ./services/misc/safeeyes.nix

     

       585
       585
        
         ./services/misc/sdrplay.nix

     

       586
       586
        
         ./services/misc/sickbeard.nix

     

       587
       587
       +
         ./services/misc/signald.nix

     

       587
       588
        
         ./services/misc/siproxd.nix

     

       588
       589
        
         ./services/misc/snapper.nix

     

       589
       590
        
         ./services/misc/sonarr.nix

+105

nixos/modules/services/misc/signald.nix

···

       1
       1
       +
       { config, lib, pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       let

     

       5
       5
       +
         cfg = config.services.signald;

     

       6
       6
       +
         dataDir = "/var/lib/signald";

     

       7
       7
       +
         defaultUser = "signald";

     

       8
       8
       +
       in

     

       9
       9
       +
       {

     

       10
       10
       +
         options.services.signald = {

     

       11
       11
       +
           enable = mkEnableOption "the signald service";

     

       12
       12
       +
       

     

       13
       13
       +
           user = mkOption {

     

       14
       14
       +
             type = types.str;

     

       15
       15
       +
             default = defaultUser;

     

       16
       16
       +
             description = "User under which signald runs.";

     

       17
       17
       +
           };

     

       18
       18
       +
       

     

       19
       19
       +
           group = mkOption {

     

       20
       20
       +
             type = types.str;

     

       21
       21
       +
             default = defaultUser;

     

       22
       22
       +
             description = "Group under which signald runs.";

     

       23
       23
       +
           };

     

       24
       24
       +
       

     

       25
       25
       +
           socketPath = mkOption {

     

       26
       26
       +
             type = types.str;

     

       27
       27
       +
             default = "/run/signald/signald.sock";

     

       28
       28
       +
             description = "Path to the signald socket";

     

       29
       29
       +
           };

     

       30
       30
       +
         };

     

       31
       31
       +
       

     

       32
       32
       +
         config = mkIf cfg.enable {

     

       33
       33
       +
           users.users = optionalAttrs (cfg.user == defaultUser) {

     

       34
       34
       +
             ${defaultUser} = {

     

       35
       35
       +
               group = cfg.group;

     

       36
       36
       +
               isSystemUser = true;

     

       37
       37
       +
             };

     

       38
       38
       +
           };

     

       39
       39
       +
       

     

       40
       40
       +
           users.groups = optionalAttrs (cfg.group == defaultUser) {

     

       41
       41
       +
             ${defaultUser} = { };

     

       42
       42
       +
           };

     

       43
       43
       +
       

     

       44
       44
       +
           systemd.services.signald = {

     

       45
       45
       +
             description = "A daemon for interacting with the Signal Private Messenger";

     

       46
       46
       +
             wants = [ "network.target" ];

     

       47
       47
       +
             wantedBy = [ "multi-user.target" ];

     

       48
       48
       +
             after = [ "network.target" ];

     

       49
       49
       +
       

     

       50
       50
       +
             serviceConfig = {

     

       51
       51
       +
               User = cfg.user;

     

       52
       52
       +
               Group = cfg.group;

     

       53
       53
       +
               ExecStart = "${pkgs.signald}/bin/signald -d ${dataDir} -s ${cfg.socketPath}";

     

       54
       54
       +
               Restart = "on-failure";

     

       55
       55
       +
               StateDirectory = "signald";

     

       56
       56
       +
               RuntimeDirectory = "signald";

     

       57
       57
       +
               StateDirectoryMode = "0750";

     

       58
       58
       +
               RuntimeDirectoryMode = "0750";

     

       59
       59
       +
       

     

       60
       60
       +
               BindReadOnlyPaths = [

     

       61
       61
       +
                 "/nix/store"

     

       62
       62
       +
                 "-/etc/resolv.conf"

     

       63
       63
       +
                 "-/etc/nsswitch.conf"

     

       64
       64
       +
                 "-/etc/hosts"

     

       65
       65
       +
                 "-/etc/localtime"

     

       66
       66
       +
               ];

     

       67
       67
       +
               CapabilityBoundingSet = "";

     

       68
       68
       +
               # ProtectClock= adds DeviceAllow=char-rtc r

     

       69
       69
       +
               DeviceAllow = "";

     

       70
       70
       +
               # Use a static user so other applications can access the files

     

       71
       71
       +
               #DynamicUser = true;

     

       72
       72
       +
               LockPersonality = true;

     

       73
       73
       +
               # Needed for java

     

       74
       74
       +
               #MemoryDenyWriteExecute = true;

     

       75
       75
       +
               NoNewPrivileges = true;

     

       76
       76
       +
               PrivateDevices = true;

     

       77
       77
       +
               PrivateMounts = true;

     

       78
       78
       +
               # Needs network access

     

       79
       79
       +
               #PrivateNetwork = true;

     

       80
       80
       +
               PrivateTmp = true;

     

       81
       81
       +
               PrivateUsers = true;

     

       82
       82
       +
               ProcSubset = "pid";

     

       83
       83
       +
               ProtectClock = true;

     

       84
       84
       +
               ProtectHome = true;

     

       85
       85
       +
               ProtectHostname = true;

     

       86
       86
       +
               # Would re-mount paths ignored by temporary root

     

       87
       87
       +
               #ProtectSystem = "strict";

     

       88
       88
       +
               ProtectControlGroups = true;

     

       89
       89
       +
               ProtectKernelLogs = true;

     

       90
       90
       +
               ProtectKernelModules = true;

     

       91
       91
       +
               ProtectKernelTunables = true;

     

       92
       92
       +
               ProtectProc = "invisible";

     

       93
       93
       +
               RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ];

     

       94
       94
       +
               RestrictNamespaces = true;

     

       95
       95
       +
               RestrictRealtime = true;

     

       96
       96
       +
               RestrictSUIDSGID = true;

     

       97
       97
       +
               SystemCallArchitectures = "native";

     

       98
       98
       +
               SystemCallFilter = [ "@system-service" "~@privileged @resources @setuid @keyring" ];

     

       99
       99
       +
               TemporaryFileSystem = "/:ro";

     

       100
       100
       +
               # Does not work well with the temporary root

     

       101
       101
       +
               #UMask = "0066";

     

       102
       102
       +
             };

     

       103
       103
       +
           };

     

       104
       104
       +
         };

     

       105
       105
       +
       }

+12 -12

pkgs/applications/networking/browsers/chromium/upstream-info.json

···

       1
       1
        
       {

     

       2
       2
        
         "stable": {

     

       3
       3
       -
           "version": "95.0.4638.54",

     

       4
       4
       -
           "sha256": "1zb1009gg9962axn2l1krycz7ml20i8z2n3ka2psxpg68pbqivry",

     

       5
       5
       -
           "sha256bin64": "0mf9jfzwz6nkz1yg8lndz1gmsvmdh1rxhqkv0vd9nr04h5x9b41a",

     

       3
       3
       +
           "version": "95.0.4638.69",

     

       4
       4
       +
           "sha256": "1rzg48mbd5n75nq2rfwknyxpmfrddds199ic82c736kcgirpv8rq",

     

       5
       5
       +
           "sha256bin64": "1jhxm12sdlgvgnny0p56xsfyxd78mwn9qwc20c33qfvwxrzp9ajp",

     

       6
       6
        
           "deps": {

     

       7
       7
        
             "gn": {

     

       8
       8
        
               "version": "2021-08-11",

     
···

       12
       12
        
             }

     

       13
       13
        
           },

     

       14
       14
        
           "chromedriver": {

     

       15
       15
       -
             "version": "95.0.4638.17",

     

       16
       16
       -
             "sha256_linux": "0jqq2h3rjancq9gk4w29gcr4b3z4irnkbvcj97fdsnksck9y5h2q",

     

       17
       17
       -
             "sha256_darwin": "0vl73i28xq3z5njg4287j08pb2sfd28amc8hkm4ddq5dgqpim0l8"

     

       15
       15
       +
             "version": "95.0.4638.54",

     

       16
       16
       +
             "sha256_linux": "0p228x7w423p3zqwfdba2jj4x4gkxz4267qzzswpba335p3k1nyk",

     

       17
       17
       +
             "sha256_darwin": "1yxi8c18fa07w8kdm63v4663lhgx1y56957bkqb7hf459bzz594l"

     

       18
       18
        
           }

     

       19
       19
        
         },

     

       20
       20
        
         "beta": {

     

       21
       21
       -
           "version": "96.0.4664.18",

     

       22
       22
       -
           "sha256": "0z7hplfl9mlbn07svcavzcb2gqn1hchwhhlpz0qykf6kd441kxpf",

     

       23
       23
       -
           "sha256bin64": "0pm8za2vkl30fn2nclg7cfq2ywn5irbzqb3blawybf3cv4ws8nbi",

     

       21
       21
       +
           "version": "96.0.4664.27",

     

       22
       22
       +
           "sha256": "1ym9llqmkhlnrmawc0dcnzkvr714kykvdcldkar5yqp0x46k7bi6",

     

       23
       23
       +
           "sha256bin64": "1x4y589qmiz0zgkpv17phcl8h5c7qankpfvv6c42w5bysx6mn1f7",

     

       24
       24
        
           "deps": {

     

       25
       25
        
             "gn": {

     

       26
       26
        
               "version": "2021-09-24",

     
···

       31
       31
        
           }

     

       32
       32
        
         },

     

       33
       33
        
         "dev": {

     

       34
       34
       -
           "version": "97.0.4676.0",

     

       35
       35
       -
           "sha256": "1cf660h7n1d4ds63747zfc4wmwxm348grcv40zg614cpjm4q68b5",

     

       36
       36
       -
           "sha256bin64": "116a4d47s3sx1pq8hhqybdsjxcv8657xaldrlix2z7jh94ip2nwh",

     

       34
       34
       +
           "version": "97.0.4682.3",

     

       35
       35
       +
           "sha256": "1z2d3r3d4g3ng1p73s243jllvvfkh085vvqz0vaa6pv7c9631pn4",

     

       36
       36
       +
           "sha256bin64": "0xravg4jjbwj7vifabz94mfammv0zx754hpa6kynjaqzvlxbax2a",

     

       37
       37
        
           "deps": {

     

       38
       38
        
             "gn": {

     

       39
       39
        
               "version": "2021-10-08",

+2 -2

pkgs/applications/networking/instant-messengers/signal-desktop/default.nix

···

       58
       58
        
         });

     

       59
       59
        
       in stdenv.mkDerivation rec {

     

       60
       60
        
         pname = "signal-desktop";

     

       61
       61
       -
         version = "5.21.0"; # Please backport all updates to the stable channel.

     

       61
       61
       +
         version = "5.22.0"; # Please backport all updates to the stable channel.

     

       62
       62
        
         # All releases have a limited lifetime and "expire" 90 days after the release.

     

       63
       63
        
         # When releases "expire" the application becomes unusable until an update is

     

       64
       64
        
         # applied. The expiration date for the current release can be extracted with:

     
···

       68
       68
        
       

     

       69
       69
        
         src = fetchurl {

     

       70
       70
        
           url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";

     

       71
       71
       -
           sha256 = "19bp5gjf13n87cyicqaikmz3bdx6szazq1kbp4gkyhq0mw7nah7c";

     

       71
       71
       +
           sha256 = "1y88qw57wk187fjb05zqvagv4pamc8171xwvznqb2k0vclsg82j8";

     

       72
       72
        
         };

     

       73
       73
        
       

     

       74
       74
        
         nativeBuildInputs = [

+16 -14

pkgs/applications/networking/instant-messengers/signald/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, fetchgit, jre_headless, coreutils, gradle_6, git, perl

     

       1
       1
       +
       { lib, stdenv, fetchurl, fetchFromGitLab, jre_headless, coreutils, gradle_6, git, perl

     

       2
       2
        
       , makeWrapper }:

     

       3
       3
        
       

     

       4
       4
        
       let

     

       5
       5
        
         pname = "signald";

     

       6
       6
       -
       

     

       7
       7
       -
         version = "0.13.1";

     

       6
       6
       +
         version = "0.14.1";

     

       8
       7
        
       

     

       9
       9
       -
         # This package uses the .git directory

     

       10
       10
       -
         src = fetchgit {

     

       11
       11
       -
           url = "https://gitlab.com/signald/signald";

     

       8
       8
       +
         src = fetchFromGitLab {

     

       9
       9
       +
           owner = pname;

     

       10
       10
       +
           repo = pname;

     

       12
       11
        
           rev = version;

     

       13
       13
       -
           sha256 = "1ilmg0i1kw2yc7m3hxw1bqdpl3i9wwbj8623qmz9cxhhavbcd5i7";

     

       14
       14
       -
           leaveDotGit = true;

     

       12
       12
       +
           sha256 = "K/G5+w1GINLZwJIG5a7u0TxlGe+Cyp4wQm+pgm28qCA=";

     

       15
       13
        
         };

     

       16
       14
        
       

     

       17
       15
        
         buildConfigJar = fetchurl {

     
···

       19
       17
        
           sha256 = "0y1f42y7ilm3ykgnm6s3ks54d71n8lsy5649xgd9ahv28lj05x9f";

     

       20
       18
        
         };

     

       21
       19
        
       

     

       22
       22
       -
         patches = [ ./git-describe-always.patch ./gradle-plugin.patch ];

     

       23
       23
       -
       

     

       24
       20
        
         postPatch = ''

     

       25
       21
        
           patchShebangs gradlew

     

       26
       22
        
           sed -i -e 's|BuildConfig.jar|${buildConfigJar}|' build.gradle

     
···

       29
       25
        
         # fake build to pre-download deps into fixed-output derivation

     

       30
       26
        
         deps = stdenv.mkDerivation {

     

       31
       27
        
           name = "${pname}-deps";

     

       32
       32
       -
           inherit src version postPatch patches;

     

       28
       28
       +
           inherit src version postPatch;

     

       33
       29
        
           nativeBuildInputs = [ gradle_6 perl ];

     

       34
       30
        
           buildPhase = ''

     

       35
       31
        
             export GRADLE_USER_HOME=$(mktemp -d)

     
···

       45
       41
        
           forceShare = [ "dummy" ];

     

       46
       42
        
           outputHashAlgo = "sha256";

     

       47
       43
        
           outputHashMode = "recursive";

     

       48
       48
       -
           outputHash = "0w8ixp1l0ch1jc2dqzxdx3ljlh17hpgns2ba7qvj43nr4prl71l7";

     

       44
       44
       +
           # Downloaded jars differ by platform

     

       45
       45
       +
           outputHash = {

     

       46
       46
       +
             x86_64-linux = "/gJFoT+vvdSWr33oI44XiZXlFfyUjtRVB1M6CMzSztM=";

     

       47
       47
       +
             aarch64-linux = "v71stMWBbNALasfGAHvsVTBaDOZfpKK3sQrjNJ6FG1A=";

     

       48
       48
       +
           }.${stdenv.system} or (throw "Unsupported platform");

     

       49
       49
        
         };

     

       50
       50
        
       

     

       51
       51
        
       in stdenv.mkDerivation rec {

     

       52
       52
       -
         inherit pname src version postPatch patches;

     

       52
       52
       +
         inherit pname src version postPatch;

     

       53
       53
       +
       

     

       54
       54
       +
         patches = [ ./gradle-plugin.patch ];

     

       53
       55
        
       

     

       54
       56
        
         buildPhase = ''

     

       55
       57
        
           runHook preBuild

     
···

       90
       92
        
           homepage = "https://signald.org";

     

       91
       93
        
           license = licenses.gpl3Plus;

     

       92
       94
        
           maintainers = with maintainers; [ expipiplus1 ];

     

       93
       93
       -
           platforms = platforms.unix;

     

       95
       95
       +
           platforms = [ "x86_64-linux" "aarch64-linux" ];

     

       94
       96
        
         };

     

       95
       97
        
       }

-9

pkgs/applications/networking/instant-messengers/signald/git-describe-always.patch

···

       1
       1
       -
       diff --git a/version.sh b/version.sh

     

       2
       2
       -
       index 7aeeb3c..060cba3 100755

     

       3
       3
       -
       --- a/version.sh

     

       4
       4
       -
       +++ b/version.sh

     

       5
       5
       -
       @@ -1,3 +1,3 @@

     

       6
       6
       -
        #!/bin/sh

     

       7
       7
       -
       -VERSION=$(git describe --exact-match 2> /dev/null) || VERSION=$(git describe --abbrev=0)+git$(date +%Y-%m-%d)r$(git rev-parse --short=8 HEAD).$(git rev-list $(git describe --abbrev=0)..HEAD --count)

     

       8
       8
       -
       +VERSION=$(git describe --exact-match 2> /dev/null) || VERSION=$(git describe --always --abbrev=0)+git$(date +%Y-%m-%d)r$(git rev-parse --short=8 HEAD).$(git rev-list $(git describe --always --abbrev=0)..HEAD --count)

     

       9
       9
       -
        echo $VERSION

+1 -8

pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch

···

       2
       2
        
       index 11d7a99..66805bb 100644

     

       3
       3
        
       --- a/build.gradle

     

       4
       4
        
       +++ b/build.gradle

     

       5
       5
       -
       @@ -3,9 +3,12 @@ import org.gradle.nativeplatform.platform.internal.OperatingSystemInternal

     

       5
       5
       +
       @@ -18,9 +18,12 @@ import org.gradle.nativeplatform.platform.internal.OperatingSystemInternal

     

       6
       6
        
        import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform

     

       7
       7
        
        import org.xml.sax.SAXParseException

     

       8
       8
        
        

     
···

       17
       17
        
        

     

       18
       18
        
        apply plugin: 'java'

     

       19
       19
        
        apply plugin: 'application'

     

       20
       20
       -
       @@ -185,4 +188,4 @@ task integrationTest(type: Test) {

     

       21
       21
       -
            testClassesDirs = sourceSets.integrationTest.output.classesDirs

     

       22
       22
       -
            classpath = sourceSets.integrationTest.runtimeClasspath

     

       23
       23
       -
            outputs.upToDateWhen { false }

     

       24
       24
       -
       -}

     

       25
       25
       -
       \ No newline at end of file

     

       26
       26
       -
       +}

+2 -2

pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix

···

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         pname = "evolution-ews";

     

       6
       6
       -
         version = "3.42.0";

     

       6
       6
       +
         version = "3.42.1";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

     

       10
       10
       -
           sha256 = "1byi1ksimbycd0daxp5j240r3n5qlaa4b3c5l9jzkjr9g3gkclsq";

     

       10
       10
       +
           sha256 = "nCvGMSfDS0GUQfF8zomVq+gKf9H72X896zptRy9/Xy0=";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ cmake gettext intltool pkg-config ];

+2 -2

pkgs/applications/networking/mailreaders/evolution/evolution/default.nix

···

       42
       42
        
       

     

       43
       43
        
       stdenv.mkDerivation rec {

     

       44
       44
        
         pname = "evolution";

     

       45
       45
       -
         version = "3.42.0";

     

       45
       45
       +
         version = "3.42.1";

     

       46
       46
        
       

     

       47
       47
        
         src = fetchurl {

     

       48
       48
        
           url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

     

       49
       49
       -
           sha256 = "0yj2hifis5m2cy59skn07d8n69444vlsw62ildr1fv67zxbblib8";

     

       49
       49
       +
           sha256 = "RlMq46E6aIV3GtEiNLlBQRZ67HRyOn7tE9293a767kU=";

     

       50
       50
        
         };

     

       51
       51
        
       

     

       52
       52
        
         nativeBuildInputs = [

+2 -2

pkgs/applications/video/kodi-packages/youtube/default.nix

···

       3
       3
        
       buildKodiAddon rec {

     

       4
       4
        
         pname = "youtube";

     

       5
       5
        
         namespace = "plugin.video.youtube";

     

       6
       6
       -
         version = "6.8.17+matrix.1";

     

       6
       6
       +
         version = "6.8.18+matrix.1";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchzip {

     

       9
       9
        
           url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";

     

       10
       10
       -
           sha256 = "AuYoUyv0DDtHnxFiNl3AF5jrMjuNRXdlJvw7d7b+yh8=";

     

       10
       10
       +
           sha256 = "F950rnE/YxwWI0ieHC2TdGNSfrQDHlStnxLbA6UjEaM=";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         propagatedBuildInputs = [

+2 -2

pkgs/desktops/gnome/apps/gnome-connections/default.nix

···

       22
       22
        
       

     

       23
       23
        
       stdenv.mkDerivation rec {

     

       24
       24
        
         pname = "gnome-connections";

     

       25
       25
       -
         version = "41.0";

     

       25
       25
       +
         version = "41.1";

     

       26
       26
        
       

     

       27
       27
        
         src = fetchurl {

     

       28
       28
        
           url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";

     

       29
       29
       -
           hash = "sha256-M5/1VaEI0gt6sPO/GCmWMWAYYOeO+peLpqudGO3DtGA=";

     

       29
       29
       +
           hash = "sha256-ia9eWM2D6mLl+abwMadKOFUIW6KS8OqFgGQIs6+DTug=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         nativeBuildInputs = [

+2 -2

pkgs/desktops/gnome/core/evolution-data-server/default.nix

···

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         pname = "evolution-data-server";

     

       9
       9
       -
         version = "3.42.0";

     

       9
       9
       +
         version = "3.42.1";

     

       10
       10
        
       

     

       11
       11
        
         outputs = [ "out" "dev" ];

     

       12
       12
        
       

     

       13
       13
        
         src = fetchurl {

     

       14
       14
        
           url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

     

       15
       15
       -
           sha256 = "6P3TvEegfW+KMFK7yuiA8g9tvE9pc6jpDQAWm7mbFjU=";

     

       15
       15
       +
           sha256 = "5uZ/KnfQ/z5tpQsD3F+iZucWYmvNou9EFE4xfjXy9Sg=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         patches = [

+2 -2

pkgs/desktops/gnome/core/gnome-control-center/default.nix

···

       68
       68
        
       

     

       69
       69
        
       stdenv.mkDerivation rec {

     

       70
       70
        
         pname = "gnome-control-center";

     

       71
       71
       -
         version = "41.0";

     

       71
       71
       +
         version = "41.1";

     

       72
       72
        
       

     

       73
       73
        
         src = fetchurl {

     

       74
       74
        
           url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";

     

       75
       75
       -
           sha256 = "sha256-pWliIq01P8+aB8QG4ofsyROOJQZFyypZQaiP8GhWWME=";

     

       75
       75
       +
           sha256 = "sha256-6gxxSExlzizBE3b5sB5iEfpKf/0zT0MH/FLJPw/d1Mc=";

     

       76
       76
        
         };

     

       77
       77
        
       

     

       78
       78
        
         patches = [

+2 -2

pkgs/desktops/gnome/core/gnome-software/default.nix

···

       42
       42
        
       

     

       43
       43
        
       stdenv.mkDerivation rec {

     

       44
       44
        
         pname = "gnome-software";

     

       45
       45
       -
         version = "41.0";

     

       45
       45
       +
         version = "41.1";

     

       46
       46
        
       

     

       47
       47
        
         src = fetchurl {

     

       48
       48
        
           url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz";

     

       49
       49
       -
           sha256 = "AkC3bsnfYi2b7A6zjkrFY8rt5oCLrZO4gmPYCXD/OcE=";

     

       49
       49
       +
           sha256 = "eil3Ziga8tvsyssQJMcT7ISYxoJ++RJG6d6Grpof4Xs=";

     

       50
       50
        
         };

     

       51
       51
        
       

     

       52
       52
        
         patches = [

+13 -1

pkgs/desktops/gnome/misc/nautilus-python/default.nix

···

       1
       1
       -
       { lib, stdenv

     

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , substituteAll

     

       2
       4
        
       , fetchurl

     

       3
       5
        
       , pkg-config

     

       4
       6
        
       , which

     
···

       22
       24
        
           url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

     

       23
       25
        
           sha256 = "161050sx3sdxqcpjkjcpf6wl4kx0jydihga7mcvrj9c2f8ly0g07";

     

       24
       26
        
         };

     

       27
       27
       +
       

     

       28
       28
       +
         patches = [

     

       29
       29
       +
           # Make PyGObject’s gi library available.

     

       30
       30
       +
           (substituteAll {

     

       31
       31
       +
             src = ./fix-paths.patch;

     

       32
       32
       +
             pythonPaths = lib.concatMapStringsSep ", " (pkg: "'${pkg}/${python3.sitePackages}'") [

     

       33
       33
       +
               python3.pkgs.pygobject3

     

       34
       34
       +
             ];

     

       35
       35
       +
           })

     

       36
       36
       +
         ];

     

       25
       37
        
       

     

       26
       38
        
         nativeBuildInputs = [

     

       27
       39
        
           pkg-config

+14

pkgs/desktops/gnome/misc/nautilus-python/fix-paths.patch

···

       1
       1
       +
       diff --git a/src/nautilus-python.c b/src/nautilus-python.c

     

       2
       2
       +
       index 843e3c6..466a513 100644

     

       3
       3
       +
       --- a/src/nautilus-python.c

     

       4
       4
       +
       +++ b/src/nautilus-python.c

     

       5
       5
       +
       @@ -184,6 +184,9 @@ nautilus_python_init_python (void) {

     

       6
       6
       +
                return FALSE;

     

       7
       7
       +
            }

     

       8
       8
       +
        

     

       9
       9
       +
       +    debug("Add PyGObject to path");

     

       10
       10
       +
       +    PyRun_SimpleString("import site;import functools; functools.reduce(lambda k, p: site.addsitedir(p, k), [@pythonPaths@], site._init_pathinfo())");

     

       11
       11
       +
       +

     

       12
       12
       +
            /* import gobject */

     

       13
       13
       +
            debug("init_pygobject");

     

       14
       14
       +
            if (!np_init_pygobject()) {

+15 -5

pkgs/development/compilers/intel-graphics-compiler/default.nix

···

       5
       5
        
       , runCommandLocal

     

       6
       6
        
       , bison

     

       7
       7
        
       , flex

     

       8
       8
       -
       , llvmPackages_8

     

       8
       8
       +
       , llvmPackages_11

     

       9
       9
       +
       , lld_11

     

       9
       10
        
       , opencl-clang

     

       10
       11
        
       , python3

     

       11
       12
        
       , spirv-llvm-translator

     
···

       14
       15
        
       }:

     

       15
       16
        
       

     

       16
       17
        
       let

     

       17
       17
       -
         llvmPkgs = llvmPackages_8 // {

     

       18
       18
       +
         vc_intrinsics_src = fetchFromGitHub {

     

       19
       19
       +
           owner = "intel";

     

       20
       20
       +
           repo = "vc-intrinsics";

     

       21
       21
       +
           rev = "e5ad7e02aa4aa21a3cd7b3e5d1f3ec9b95f58872";

     

       22
       22
       +
           sha256 = "Vg1mngwpIQ3Tik0GgRXPG22lE4sLEAEFch492G2aIXs=";

     

       23
       23
       +
         };

     

       24
       24
       +
         llvmPkgs = llvmPackages_11 // {

     

       18
       25
        
           inherit spirv-llvm-translator;

     

       19
       26
        
         };

     

       20
       27
        
         inherit (llvmPkgs) llvm;

     
···

       24
       31
        
       

     

       25
       32
        
       stdenv.mkDerivation rec {

     

       26
       33
        
         pname = "intel-graphics-compiler";

     

       27
       27
       -
         version = "1.0.4241";

     

       34
       34
       +
         version = "1.0.8744";

     

       28
       35
        
       

     

       29
       36
        
         src = fetchFromGitHub {

     

       30
       37
        
           owner = "intel";

     

       31
       38
        
           repo = "intel-graphics-compiler";

     

       32
       39
        
           rev = "igc-${version}";

     

       33
       33
       -
           sha256 = "1jp3c67ppl1x4pazr5nzy52615cpx0kyckaridhc0fsmrkgilyxq";

     

       40
       40
       +
           sha256 = "G5+dYD8uZDPkRyn1sgXsRngdq4NJndiCJCYTRXyUgTA=";

     

       34
       41
        
         };

     

       35
       42
        
       

     

       36
       43
        
         nativeBuildInputs = [ clang cmake bison flex python3 ];

     

       37
       44
        
       

     

       38
       38
       -
         buildInputs = [ clang opencl-clang spirv-llvm-translator llvm ];

     

       45
       45
       +
         buildInputs = [ clang opencl-clang spirv-llvm-translator llvm lld_11 ];

     

       39
       46
        
       

     

       40
       47
        
         strictDeps = true;

     

       41
       48
        
       

     
···

       53
       60
        
           ln -s clang $out/clang-${versions.major (getVersion clang)}

     

       54
       61
        
           ln -s ${opencl-clang}/lib/* $out/

     

       55
       62
        
           ln -s ${lib.getLib libclang}/lib/clang/${getVersion clang}/include/opencl-c.h $out/

     

       63
       63
       +
           ln -s ${lib.getLib libclang}/lib/clang/${getVersion clang}/include/opencl-c-base.h $out/

     

       56
       64
        
         '';

     

       57
       65
        
       

     

       58
       66
        
         cmakeFlags = [

     

       67
       67
       +
           "-DVC_INTRINSICS_SRC=${vc_intrinsics_src}"

     

       68
       68
       +
           "-DINSTALL_SPIRVDLL=0"

     

       59
       69
        
           "-DCCLANG_BUILD_PREBUILDS=ON"

     

       60
       70
        
           "-DCCLANG_BUILD_PREBUILDS_DIR=${prebuilds}"

     

       61
       71
        
           "-DIGC_PREFERRED_LLVM_VERSION=${getVersion llvm}"

+2 -2

pkgs/development/compilers/scala/dotty-bare.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, makeWrapper, jre, ncurses }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         version = "3.0.0";

     

       4
       4
       +
         version = "3.1.0";

     

       5
       5
        
         pname = "dotty-bare";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://github.com/lampepfl/dotty/releases/download/${version}/scala3-${version}.tar.gz";

     

       9
       9
       -
           sha256 = "/F2yv4XH0I3oC3IFqj+jwpzShCtTEfTzg+J26Xl+P+Y=";

     

       9
       9
       +
           sha256 = "9bsZ2FtIb6AvA3W3r2Vv0dPNicuYjMBz3X48z45Avv8=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         propagatedBuildInputs = [ jre ncurses.dev ] ;

+9 -8

pkgs/development/compilers/spirv-llvm-translator/default.nix

···

       2
       2
        
       , fetchFromGitHub

     

       3
       3
        
       , cmake

     

       4
       4
        
       , pkg-config

     

       5
       5
       -
       

     

       6
       5
        
       , lit

     

       7
       7
       -
       , llvm_8

     

       6
       6
       +
       , llvm_11

     

       8
       7
        
       }:

     

       9
       8
        
       

     

       10
       9
        
       stdenv.mkDerivation rec {

     

       11
       10
        
         pname = "SPIRV-LLVM-Translator";

     

       12
       12
       -
         version = "8.0.1-2";

     

       11
       11
       +
         version = "unstable-2021-06-13";

     

       13
       12
        
       

     

       14
       13
        
         src = fetchFromGitHub {

     

       15
       14
        
           owner = "KhronosGroup";

     

       16
       15
        
           repo = "SPIRV-LLVM-Translator";

     

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

     

       18
       18
       -
           sha256 = "0hxalc3fkliqs61hpr97phbm3qsx4b8vgnlg30aimzr6aas403r5";

     

       16
       16
       +
           rev = "c67e6f26a7285aa753598ef792593ac4a545adf9";

     

       17
       17
       +
           sha256 = "sha256-1s3lVNTQDl+pUvbzSMsp3cOUSm6I4DzqJxnLMeeE3F4=";

     

       19
       18
        
         };

     

       20
       19
        
       

     

       21
       21
       -
         nativeBuildInputs = [ pkg-config cmake llvm_8.dev ];

     

       20
       20
       +
         nativeBuildInputs = [ pkg-config cmake llvm_11.dev ];

     

       22
       21
        
       

     

       23
       23
       -
         buildInputs = [ llvm_8 ];

     

       22
       22
       +
         buildInputs = [ llvm_11 ];

     

       24
       23
        
       

     

       25
       24
        
         checkInputs = [ lit ];

     

       26
       25
        
       

     

       27
       27
       -
         cmakeFlags = [ "-DLLVM_INCLUDE_TESTS=ON" ];

     

       26
       26
       +
         cmakeFlags = [

     

       27
       27
       +
           "-DLLVM_INCLUDE_TESTS=ON"

     

       28
       28
       +
         ];

     

       28
       29
        
       

     

       29
       30
        
         # FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist

     

       30
       31
        
         doCheck = false;

+2 -2

pkgs/development/coq-modules/coqeal/default.nix

···

       4
       4
        
       with lib; mkCoqDerivation {

     

       5
       5
        
       

     

       6
       6
        
         pname = "CoqEAL";

     

       7
       7
       -
         owner = "CoqEAL";

     

       7
       7
       +
       

     

       8
       8
        
         inherit version;

     

       9
       9
        
         defaultVersion = with versions; switch [ coq.version mathcomp.version ]  [

     

       10
       10
       -
             { cases = [ (isGe "8.10") "1.12.0" ]; out = "1.0.6"; }

     

       10
       10
       +
             { cases = [ (isGe "8.10") (isGe "1.12.0") ]; out = "1.0.6"; }

     

       11
       11
        
             { cases = [ (isGe "8.10") (range "1.11.0" "1.12.0") ]; out = "1.0.5"; }

     

       12
       12
        
             { cases = [ (isGe "8.7") "1.11.0" ]; out = "1.0.4"; }

     

       13
       13
        
             { cases = [ (isGe "8.7") "1.10.0" ]; out = "1.0.3"; }

+3 -3

pkgs/development/coq-modules/extructures/default.nix

···

       9
       9
        
         owner = "arthuraa";

     

       10
       10
        
       

     

       11
       11
        
         inherit version;

     

       12
       12
       -
         defaultVersion = with versions; switch coq.coq-version [

     

       13
       13
       -
           { case = range "8.11" "8.14"; out = "0.3.0"; }

     

       14
       14
       -
           { case = range "8.10" "8.12"; out = "0.2.2"; }

     

       12
       12
       +
         defaultVersion = with versions; switch [coq.coq-version ssreflect.version] [

     

       13
       13
       +
           { cases = [(range "8.11" "8.14") (isLe "1.12.0") ]; out = "0.3.0"; }

     

       14
       14
       +
           { cases = [(range "8.10" "8.12") (isLe "1.12.0") ]; out = "0.2.2"; }

     

       15
       15
        
         ] null;

     

       16
       16
        
       

     

       17
       17
        
         releaseRev = v: "v${v}";

+4 -3

pkgs/development/coq-modules/gaia-hydras/default.nix

···

       1
       1
       -
       { lib, mkCoqDerivation, coq, hydra-battles, gaia, mathcomp-zify, version ? null }:

     

       1
       1
       +
       { lib, mkCoqDerivation, coq, hydra-battles, gaia,

     

       2
       2
       +
         mathcomp-zify, mathcomp, version ? null }:

     

       2
       3
        
       

     

       3
       4
        
       with lib; mkCoqDerivation rec {

     

       4
       5
        
         pname = "gaia-hydras";

     
···

       8
       9
        
         releaseRev = (v: "v${v}");

     

       9
       10
        
       

     

       10
       11
        
         inherit version;

     

       11
       11
       -
         defaultVersion = with versions; switch coq.coq-version [

     

       12
       12
       -
           { case = range "8.13" "8.14"; out = "0.5"; }

     

       12
       12
       +
         defaultVersion = with versions; switch [coq.coq-version mathcomp.version] [

     

       13
       13
       +
           { cases = [ (range "8.13" "8.14") (isGe "1.12.0") ]; out = "0.5"; }

     

       13
       14
        
         ] null;

     

       14
       15
        
       

     

       15
       16
        
         propagatedBuildInputs = [

+2 -1

pkgs/development/coq-modules/gaia/default.nix

···

       5
       5
        
       

     

       6
       6
        
         release."1.11".sha256 = "sha256:0gwb0blf37sv9gb0qpn34dab71zdcx7jsnqm3j9p58qw65cgsqn5";

     

       7
       7
        
         release."1.12".sha256 = "sha256:0c6cim4x6f9944g8v0cp0lxs244lrhb04ms4y2s6y1wh321zj5mi";

     

       8
       8
       +
         release."1.13".sha256 = "sha256:0i8ix2rbw10v34bi0yrx0z89ng96ydqbxm8rv2rnfgy4d1b27x6q";

     

       8
       9
        
         releaseRev = (v: "v${v}");

     

       9
       10
        
       

     

       10
       11
        
         inherit version;

     

       11
       12
        
         defaultVersion = with versions; switch [ coq.version mathcomp.version ] [

     

       12
       12
       -
           { cases = [ (range "8.10" "8.14") "1.12.0" ]; out = "1.12"; }

     

       13
       13
       +
           { cases = [ (range "8.10" "8.14") (isGe "1.12.0") ]; out = "1.13"; }

     

       13
       14
        
           { cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "1.11"; }

     

       14
       15
        
         ] null;

     

       15
       16

+7 -3

pkgs/development/coq-modules/mathcomp-abel/default.nix

···

       6
       6
        
         pname = "abel";

     

       7
       7
        
         owner = "math-comp";

     

       8
       8
        
       

     

       9
       9
       -
         release."1.0.0".sha256 = "190jd8hb8anqsvr9ysr514pm5sh8qhw4030ddykvwxx9d9q6rbp3";

     

       10
       10
       -
       

     

       11
       9
        
         inherit version;

     

       12
       10
        
         defaultVersion = with lib; with versions; switch [ coq.version mathcomp.version ]  [

     

       13
       13
       -
             { cases = [ (range "8.10" "8.13") (range "1.11.0" "1.12.0") ]; out = "1.0.0"; }

     

       11
       11
       +
             { cases = [ (range "8.10" "8.14") (range "1.12.0" "1.13.0") ]; out = "1.2.0"; }

     

       12
       12
       +
             { cases = [ (range "8.10" "8.14") (range "1.11.0" "1.12.0") ]; out = "1.1.2"; }

     

       14
       13
        
           ] null;

     

       14
       14
       +
       

     

       15
       15
       +
         release."1.2.0".sha256 = "1picd4m85ipj22j3b84cv8ab3330radzrhd6kp0gpxq14dhv02c2";

     

       16
       16
       +
         release."1.1.2".sha256 = "0565w713z1cwxvvdlqws2z5lgdys8lddf0vpwfdj7bpd7pq9hwxg";

     

       17
       17
       +
         release."1.0.0".sha256 = "190jd8hb8anqsvr9ysr514pm5sh8qhw4030ddykvwxx9d9q6rbp3";

     

       18
       18
       +
       

     

       15
       19
        
       

     

       16
       20
        
         propagatedBuildInputs = [ mathcomp.field mathcomp-real-closed ];

     

       17
       21

+1 -1

pkgs/development/coq-modules/mathcomp-analysis/default.nix

···

       18
       18
        
       

     

       19
       19
        
         inherit version;

     

       20
       20
        
         defaultVersion = with versions; switch [ coq.version mathcomp.version ]  [

     

       21
       21
       -
             { cases = [ (range "8.11" "8.13") "1.12.0" ];             out = "0.3.10"; }

     

       21
       21
       +
             { cases = [ (range "8.11" "8.14") (isGe "1.12.0") ];      out = "0.3.10"; }

     

       22
       22
        
             { cases = [ (range "8.11" "8.13") "1.11.0" ];             out = "0.3.4"; }

     

       23
       23
        
             { cases = [ (range "8.10" "8.12") "1.11.0" ];             out = "0.3.3"; }

     

       24
       24
        
             { cases = [ (range "8.10" "8.11") "1.11.0" ];             out = "0.3.1"; }

+1 -1

pkgs/development/coq-modules/mathcomp-finmap/default.nix

···

       7
       7
        
         owner = "math-comp";

     

       8
       8
        
         inherit version;

     

       9
       9
        
         defaultVersion = with versions; switch [ coq.version mathcomp.version ]  [

     

       10
       10
       -
             { cases = [ (isGe "8.10")          (range "1.11" "1.12") ]; out = "1.5.1"; }

     

       10
       10
       +
             { cases = [ (isGe "8.10")          (range "1.11" "1.13") ]; out = "1.5.1"; }

     

       11
       11
        
             { cases = [ (range "8.7" "8.11")   "1.11.0" ];              out = "1.5.0"; }

     

       12
       12
        
             { cases = [ (isEq "8.11")          (range "1.8" "1.10") ];  out = "1.4.0+coq-8.11"; }

     

       13
       13
        
             { cases = [ (range "8.7" "8.11.0") (range "1.8" "1.10") ];  out = "1.4.0"; }

+1 -1

pkgs/development/coq-modules/mathcomp-real-closed/default.nix

···

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         defaultVersion = with versions; switch [ coq.version mathcomp.version ]  [

     

       20
       20
       -
             { cases = [ (isGe "8.10")  "1.12.0" ]; out = "1.1.2"; }

     

       20
       20
       +
             { cases = [ (isGe "8.10")  (isGe "1.12.0") ]; out = "1.1.2"; }

     

       21
       21
        
             { cases = [ (isGe "8.7")   "1.11.0" ]; out = "1.1.1"; }

     

       22
       22
        
             { cases = [ (isGe "8.7")   (range "1.9.0" "1.10.0") ]; out = "1.0.4"; }

     

       23
       23
        
             { cases = [ (isGe "8.7")   "1.8.0"  ]; out = "1.0.3"; }

+22

pkgs/development/coq-modules/mathcomp-tarjan/default.nix

···

       1
       1
       +
       { coq, mkCoqDerivation, mathcomp-ssreflect, mathcomp-fingroup,

     

       2
       2
       +
         lib, version ? null }@args:

     

       3
       3
       +
       with lib; mkCoqDerivation {

     

       4
       4
       +
       

     

       5
       5
       +
         namePrefix = [ "coq" "mathcomp" ];

     

       6
       6
       +
         pname = "tarjan";

     

       7
       7
       +
         owner = "math-comp";

     

       8
       8
       +
       

     

       9
       9
       +
         inherit version;

     

       10
       10
       +
         defaultVersion = with versions;

     

       11
       11
       +
           switch [ coq.version mathcomp-ssreflect.version ] [{

     

       12
       12
       +
             cases = [ (range "8.10" "8.14") (isGe "1.12.0") ]; out = "1.0.0";

     

       13
       13
       +
         }] null;

     

       14
       14
       +
         release."1.0.0".sha256 = "sha256:0r459r0makshzwlygw6kd4lpvdjc43b3x5y9aa8x77f2z5gymjq1";

     

       15
       15
       +
       

     

       16
       16
       +
         propagatedBuildInputs = [ mathcomp-ssreflect mathcomp-fingroup ];

     

       17
       17
       +
       

     

       18
       18
       +
         meta = {

     

       19
       19
       +
           description = "Proofs of Tarjan and Kosaraju connected components algorithms";

     

       20
       20
       +
           license = licenses.cecill-b;

     

       21
       21
       +
         };

     

       22
       22
       +
       }

+3 -2

pkgs/development/coq-modules/mathcomp-zify/default.nix

···

       1
       1
        
       { lib, mkCoqDerivation, coq, mathcomp-algebra, version ? null }:

     

       2
       2
        
       

     

       3
       3
        
       with lib; mkCoqDerivation rec {

     

       4
       4
       -
         pname = "mathcomp-zify";

     

       4
       4
       +
         namePrefix = [ "coq" "mathcomp" ];

     

       5
       5
       +
         pname = "zify";

     

       5
       6
        
         repo = "mczify";

     

       6
       7
        
         owner = "math-comp";

     

       7
       8
        
         inherit version;

     

       8
       9
        
       

     

       9
       10
        
         defaultVersion = with versions;

     

       10
       11
        
            switch [ coq.coq-version mathcomp-algebra.version ] [

     

       11
       11
       -
              { cases = [ (range "8.13" "8.14") (isEq "1.12") ]; out = "1.1.0+1.12+8.13"; }

     

       12
       12
       +
              { cases = [ (range "8.13" "8.14") (isGe "1.12") ]; out = "1.1.0+1.12+8.13"; }

     

       12
       13
        
            ] null;

     

       13
       14
        
       

     

       14
       15
        
         release."1.0.0+1.12+8.13".sha256 = "1j533vx6lacr89bj1bf15l1a0s7rvrx4l00wyjv99aczkfbz6h6k";

+3 -1

pkgs/development/coq-modules/mathcomp/default.nix

···

       19
       19
        
         owner = "math-comp";

     

       20
       20
        
         withDoc = single && (args.withDoc or false);

     

       21
       21
        
         defaultVersion = with versions; switch coq.coq-version [

     

       22
       22
       -
             { case = isGe  "8.10";        out = "1.12.0"; }

     

       22
       22
       +
             { case = isGe  "8.14";        out = "1.13.0"; }

     

       23
       23
       +
             { case = range "8.10" "8.13"; out = "1.12.0"; }

     

       23
       24
        
             { case = range "8.7"  "8.12"; out = "1.11.0"; }

     

       24
       25
        
             { case = range "8.7" "8.11";  out = "1.10.0"; }

     

       25
       26
        
             { case = range "8.7" "8.11";  out = "1.9.0";  }

     
···

       28
       29
        
             { case = range "8.5" "8.7";   out = "1.6.4";  }

     

       29
       30
        
           ] null;

     

       30
       31
        
         release = {

     

       32
       32
       +
           "1.13.0".sha256 = "0j4cz2y1r1aw79snkcf1pmicgzf8swbaf9ippz0vg99a572zqzri";

     

       31
       33
        
           "1.12.0".sha256 = "1ccfny1vwgmdl91kz5xlmhq4wz078xm4z5wpd0jy5rn890dx03wp";

     

       32
       34
        
           "1.11.0".sha256 = "06a71d196wd5k4wg7khwqb7j7ifr7garhwkd54s86i0j7d6nhl3c";

     

       33
       35
        
           "1.10.0".sha256 = "1b9m6pwxxyivw7rgx82gn5kmgv2mfv3h3y0mmjcjfypi8ydkrlbv";

+1 -1

pkgs/development/coq-modules/multinomials/default.nix

···

       9
       9
        
       

     

       10
       10
        
         inherit version;

     

       11
       11
        
         defaultVersion =  with versions; switch [ coq.version mathcomp.version ] [

     

       12
       12
       -
             { cases = [ (range "8.10" "8.14") "1.12.0" ];             out = "1.5.4"; }

     

       12
       12
       +
             { cases = [ (range "8.10" "8.14") (isGe "1.12.0") ];      out = "1.5.4"; }

     

       13
       13
        
             { cases = [ (range "8.10" "8.12") "1.12.0" ];             out = "1.5.3"; }

     

       14
       14
        
             { cases = [ (range "8.7" "8.12")  "1.11.0" ];             out = "1.5.2"; }

     

       15
       15
        
             { cases = [ (range "8.7" "8.11")  (range "1.8" "1.10") ]; out = "1.5.0"; }

+1 -1

pkgs/development/coq-modules/odd-order/default.nix

···

       10
       10
        
       

     

       11
       11
        
         inherit version;

     

       12
       12
        
         defaultVersion = with versions; switch mathcomp.character.version [

     

       13
       13
       -
           { case = pred.union (isGe "1.10.0") (isEq "dev"); out = "1.12.0"; }

     

       13
       13
       +
           { case = (range "1.10.0" "1.12.0"); out = "1.12.0"; }

     

       14
       14
        
         ] null;

     

       15
       15
        
       

     

       16
       16
        
         propagatedBuildInputs = [ mathcomp.character ];

+1

pkgs/development/libraries/arrow-cpp/default.nix

···

       90
       90
        
           "-DARROW_BUILD_TESTS=ON"

     

       91
       91
        
           "-DARROW_VERBOSE_THIRDPARTY_BUILD=ON"

     

       92
       92
        
           "-DARROW_DEPENDENCY_SOURCE=SYSTEM"

     

       93
       93
       +
           "-DThrift_SOURCE=AUTO" # search for Thrift using pkg-config (ThriftConfig.cmake requires OpenSSL and libevent)

     

       93
       94
        
           "-DARROW_DEPENDENCY_USE_SHARED=${if enableShared then "ON" else "OFF"}"

     

       94
       95
        
           "-DARROW_COMPUTE=ON"

     

       95
       96
        
           "-DARROW_CSV=ON"

+3 -2

pkgs/development/libraries/gnome-online-accounts/default.nix

···

       30
       30
        
       

     

       31
       31
        
       stdenv.mkDerivation rec {

     

       32
       32
        
         pname = "gnome-online-accounts";

     

       33
       33
       -
         version = "3.40.0";

     

       33
       33
       +
         version = "3.40.1";

     

       34
       34
        
       

     

       35
       35
        
         # https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87

     

       36
       36
        
         src = fetchFromGitLab {

     
···

       38
       38
        
           owner = "GNOME";

     

       39
       39
        
           repo = "gnome-online-accounts";

     

       40
       40
        
           rev = version;

     

       41
       41
       -
           sha256 = "sha256-GuUWypfmfbovpDKnj6wSBuNeKJIfIyipY+01u/p4znU=";

     

       41
       41
       +
           sha256 = "sha256-q4bLGOOGoGH/Et3hu7/372tjNMouX9ePTanIo0c4Jbw=";

     

       42
       42
        
         };

     

       43
       43
        
       

     

       44
       44
        
         outputs = [ "out" "man" "dev" "devdoc" ];

     
···

       90
       90
        
       

     

       91
       91
        
         passthru = {

     

       92
       92
        
           updateScript = gnome.updateScript {

     

       93
       93
       +
             versionPolicy = "odd-unstable";

     

       93
       94
        
             packageName = pname;

     

       94
       95
        
           };

     

       95
       96
        
         };

+18 -10

pkgs/development/libraries/opencl-clang/default.nix

···

       5
       5
        
       , cmake

     

       6
       6
        
       , git

     

       7
       7
        
       

     

       8
       8
       -
       , llvmPackages_8

     

       8
       8
       +
       , llvmPackages_11

     

       9
       9
        
       , spirv-llvm-translator

     

       10
       10
        
       

     

       11
       11
        
       , buildWithPatches ? true

     

       12
       12
        
       }:

     

       13
       13
        
       

     

       14
       14
        
       let

     

       15
       15
       -
         llvmPkgs = llvmPackages_8 // {

     

       15
       15
       +
         llvmPkgs = llvmPackages_11 // {

     

       16
       16
        
           inherit spirv-llvm-translator;

     

       17
       17
        
         };

     

       18
       18
        
       

     
···

       31
       31
        
           });

     

       32
       32
        
       

     

       33
       33
        
         passthru = rec {

     

       34
       34
       -
       

     

       34
       34
       +
           spirv-llvm-translator = llvmPkgs.spirv-llvm-translator;

     

       35
       35
       +
           llvm = addPatches "llvm" llvmPkgs.llvm;

     

       35
       36
        
           libclang = addPatches "clang" llvmPkgs.libclang;

     

       36
       37
        
       

     

       37
       38
        
           clang-unwrapped = libclang.out;

     
···

       43
       44
        
           patchesOut = stdenv.mkDerivation rec {

     

       44
       45
        
             pname = "opencl-clang-patches";

     

       45
       46
        
             inherit (library) version src patches;

     

       47
       47
       +
             # Clang patches assume the root is the llvm root dir

     

       48
       48
       +
             # but clang root in nixpkgs is the clang sub-directory

     

       49
       49
       +
             postPatch = ''

     

       50
       50
       +
               for filename in patches/clang/*.patch; do

     

       51
       51
       +
                 substituteInPlace "$filename" \

     

       52
       52
       +
                   --replace "a/clang/" "a/" \

     

       53
       53
       +
                   --replace "b/clang/" "b/"

     

       54
       54
       +
               done

     

       55
       55
       +
             '';

     

       56
       56
       +
       

     

       46
       57
        
             installPhase = ''

     

       47
       58
        
               [ -d patches ] && cp -r patches/ $out || mkdir $out

     

       48
       48
       -
               mkdir -p $out/clang $out/spirv

     

       59
       59
       +
               mkdir -p $out/clang $out/llvm

     

       49
       60
        
             '';

     

       50
       61
        
           };

     

       51
       51
       -
       

     

       52
       52
       -
           spirv-llvm-translator = addPatches "spirv" llvmPkgs.spirv-llvm-translator;

     

       53
       53
       -
       

     

       54
       62
        
         };

     

       55
       63
        
       

     

       56
       64
        
         library = let

     
···

       59
       67
        
         in

     

       60
       68
        
           stdenv.mkDerivation rec {

     

       61
       69
        
             pname = "opencl-clang";

     

       62
       62
       -
             version = "unstable-2019-08-16";

     

       70
       70
       +
             version = "unstable-2021-06-22";

     

       63
       71
        
       

     

       64
       72
        
             inherit passthru;

     

       65
       73
        
       

     

       66
       74
        
             src = fetchFromGitHub {

     

       67
       75
        
               owner = "intel";

     

       68
       76
        
               repo = "opencl-clang";

     

       69
       69
       -
               rev = "94af090661d7c953c516c97a25ed053c744a0737";

     

       70
       70
       -
               sha256 = "05cg89m62nqjqm705h7gpdz4jd4hiczg8944dcjsvaybrqv3hcm5";

     

       77
       77
       +
               rev = "fd68f64b33e67d58f6c36b9e25c31c1178a1962a";

     

       78
       78
       +
               sha256 = "sha256-q1YPBb/LY67iEuQx1fMUQD/I7OsNfobW3yNfJxLXx3E=";

     

       71
       79
        
             };

     

       72
       80
        
       

     

       73
       81
        
             patches = [

+24

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       buildPythonPackage rec {

     

       7
       7
       +
         pname = "flashtext";

     

       8
       8
       +
         version = "2.7";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchPypi {

     

       11
       11
       +
           inherit pname version;

     

       12
       12
       +
           sha256 = "1kq5idfp9skqkjdcld40igxn2yqjly8jpmxawkp0skwxw29jpgm1";

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         # json files that tests look for don't exist in the pypi dist

     

       16
       16
       +
         doCheck = false;

     

       17
       17
       +
       

     

       18
       18
       +
         meta = with lib; {

     

       19
       19
       +
           homepage = "http://github.com/vi3k6i5/flashtext";

     

       20
       20
       +
           description = "Python package to replace keywords in sentences or extract keywords from sentences";

     

       21
       21
       +
           maintainers = with maintainers; [ aanderse ];

     

       22
       22
       +
           license = with licenses; [ mit ];

     

       23
       23
       +
         };

     

       24
       24
       +
       }

+21

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       buildPythonPackage rec {

     

       7
       7
       +
         pname = "striprtf";

     

       8
       8
       +
         version = "0.0.15";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchPypi {

     

       11
       11
       +
           inherit pname version;

     

       12
       12
       +
           sha256 = "1yvgnmds034z28mscff0amm0g47ni0753nshvrq2swdpipymiwz0";

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         meta = with lib; {

     

       16
       16
       +
           homepage = "https://github.com/joshy/striprtf";

     

       17
       17
       +
           description = "A simple library to convert rtf to text";

     

       18
       18
       +
           maintainers = with maintainers; [ aanderse ];

     

       19
       19
       +
           license = with licenses; [ bsd3 ];

     

       20
       20
       +
         };

     

       21
       21
       +
       }

+4 -4

pkgs/misc/drivers/epson-escpr2/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "epson-inkjet-printer-escpr2";

     

       5
       5
       -
         version = "1.1.38";

     

       5
       5
       +
         version = "1.1.42";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           # To find new versions, visit

     
···

       11
       11
        
           # version.

     

       12
       12
        
           # NOTE: Don't forget to update the webarchive link too!

     

       13
       13
        
           urls = [

     

       14
       14
       -
             "https://download3.ebz.epson.net/dsc/f/03/00/12/91/84/6902a4d11864b195ddda45f6de968d8ec1ee9e3b/epson-inkjet-printer-escpr2-1.1.38-1lsb3.2.src.rpm"

     

       15
       15
       -
             "https://web.archive.org/web/20210731163511/https://download3.ebz.epson.net/dsc/f/03/00/12/91/84/6902a4d11864b195ddda45f6de968d8ec1ee9e3b/epson-inkjet-printer-escpr2-1.1.38-1lsb3.2.src.rpm"

     

       14
       14
       +
             "https://download3.ebz.epson.net/dsc/f/03/00/13/07/72/df79cc238a167b9526f70cc123459c6bbe1edbad/epson-inkjet-printer-escpr2-1.1.42-1lsb3.2.src.rpm"

     

       15
       15
       +
             "https://web.archive.org/web/20211029093638/https://download3.ebz.epson.net/dsc/f/03/00/13/07/72/df79cc238a167b9526f70cc123459c6bbe1edbad/epson-inkjet-printer-escpr2-1.1.42-1lsb3.2.src.rpm"

     

       16
       16
        
           ];

     

       17
       17
       -
           sha256 = "sha256-rQtmWREZKtu5MuqEn91/1+SfGol4f8jKzd1mQ0e3h1c=";

     

       17
       17
       +
           sha256 = "sha256-CsZUurwwoXNWONZKAIkRd0ztmAr5wLWZhirCzJWWqMA=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         unpackPhase = ''

+2 -2

pkgs/os-specific/linux/intel-compute-runtime/default.nix

···

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation rec {

     

       13
       13
        
         pname = "intel-compute-runtime";

     

       14
       14
       -
         version = "20.34.17727";

     

       14
       14
       +
         version = "21.42.21270";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "intel";

     

       18
       18
        
           repo = "compute-runtime";

     

       19
       19
        
           rev = version;

     

       20
       20
       -
           sha256 = "19scbbr6jf3yp2v7z8xyzzm01g44jym7xfkf1dz64d5nhvjw6ig5";

     

       20
       20
       +
           sha256 = "N9MsDcsL8kBWxfZjhukcxZiSJnXxqMgWF0etOhf2/AE=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [ cmake pkg-config ];

+2 -2

pkgs/tools/admin/credhub-cli/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "credhub-cli";

     

       5
       5
       -
         version = "2.9.0";

     

       5
       5
       +
         version = "2.9.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "cloudfoundry-incubator";

     

       9
       9
        
           repo = "credhub-cli";

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "1j0i0b79ph2i52cj0qln8wvp6gwhl73akkn026h27vvmlw9sndc2";

     

       11
       11
       +
           sha256 = "sha256-2+KOf6VQ1jTXfFE+Ptd3iiOEhvENU0XUclQ+e85DpUo=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         patches = [

+3 -3

pkgs/tools/filesystems/gocryptfs/default.nix

···

       12
       12
        
       

     

       13
       13
        
       buildGoModule rec {

     

       14
       14
        
         pname = "gocryptfs";

     

       15
       15
       -
         version = "2.1";

     

       15
       15
       +
         version = "2.2.1";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "rfjakob";

     

       19
       19
        
           repo = pname;

     

       20
       20
        
           rev = "v${version}";

     

       21
       21
       -
           sha256 = "sha256-nACBEOL/vnqxdAGI37k9bxgQKgpi35/tsuCxsQ9I2sw=";

     

       21
       21
       +
           sha256 = "sha256-qERtX9UcdMolbffzPiVQlblirzJ5baOmHonJIO8ang0=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
       -
         vendorSha256 = "sha256-Q/oBT5xdLpgQCIk7KES6c8+BaCQVUIwCwVufl4oTFRs=";

     

       24
       24
       +
         vendorSha256 = "sha256-yJ7RYwhArgmGlFmSplrX1hiLkc7FkS1qQCUcRlbnNWQ=";

     

       25
       25
        
       

     

       26
       26
        
         nativeBuildInputs = [

     

       27
       27
        
           makeWrapper

+2 -2

pkgs/tools/misc/svtplay-dl/default.nix

···

       9
       9
        
       

     

       10
       10
        
       in stdenv.mkDerivation rec {

     

       11
       11
        
         pname = "svtplay-dl";

     

       12
       12
       -
         version = "4.7";

     

       12
       12
       +
         version = "4.8";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "spaam";

     

       16
       16
        
           repo = "svtplay-dl";

     

       17
       17
        
           rev = version;

     

       18
       18
       -
           sha256 = "19ajm4bf7knnchggfbajx0c29q4sj8ffsvqmgizgsjdz48ppx2yf";

     

       18
       18
       +
           sha256 = "1mlf0yvj3zy3df0ip7qb6g4v7032rsz038a7d25zn6yfzsz04br3";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         pythonPaths = [ cryptography pyyaml requests ];

+1 -1

pkgs/tools/networking/brook/default.nix

···

       17
       17
        
           homepage = "https://github.com/txthinking/brook";

     

       18
       18
        
           description = "A cross-platform Proxy/VPN software";

     

       19
       19
        
           license = with licenses; [ gpl3Only ];

     

       20
       20
       -
           platforms = platforms.linux;

     

       20
       20
       +
           platforms = platforms.unix;

     

       21
       21
        
           maintainers = with maintainers; [ xrelkd ];

     

       22
       22
        
         };

     

       23
       23
        
       }

+1 -1

pkgs/tools/networking/ssldump/default.nix

···

       47
       47
        
           homepage = "http://ssldump.sourceforge.net";

     

       48
       48
        
           license = "BSD-style";

     

       49
       49
        
           maintainers = with maintainers; [ aycanirican ];

     

       50
       50
       -
           platforms = platforms.linux;

     

       50
       50
       +
           platforms = platforms.unix;

     

       51
       51
        
         };

     

       52
       52
        
       }

+1

pkgs/top-level/coq-packages.nix

···

       74
       74
        
             mathcomp-bigenough = callPackage ../development/coq-modules/mathcomp-bigenough {};

     

       75
       75
        
             mathcomp-real-closed = callPackage ../development/coq-modules/mathcomp-real-closed {};

     

       76
       76
        
             mathcomp-zify = callPackage ../development/coq-modules/mathcomp-zify {};

     

       77
       77
       +
             mathcomp-tarjan = callPackage ../development/coq-modules/mathcomp-tarjan {};

     

       77
       78
        
             metalib = callPackage ../development/coq-modules/metalib { };

     

       78
       79
        
             multinomials = callPackage ../development/coq-modules/multinomials {};

     

       79
       80
        
             odd-order = callPackage ../development/coq-modules/odd-order { };

+4

pkgs/top-level/python-packages.nix

···

       2701
       2701
        
       

     

       2702
       2702
        
         flammkuchen = callPackage ../development/python-modules/flammkuchen { };

     

       2703
       2703
        
       

     

       2704
       2704
       +
         flashtext = callPackage ../development/python-modules/flashtext { };

     

       2705
       2705
       +
       

     

       2704
       2706
        
         flask-admin = callPackage ../development/python-modules/flask-admin { };

     

       2705
       2707
        
       

     

       2706
       2708
        
         flask-api = callPackage ../development/python-modules/flask-api { };

     
···

       8879
       8881
        
         stringcase = callPackage ../development/python-modules/stringcase { };

     

       8880
       8882
        
       

     

       8881
       8883
        
         stripe = callPackage ../development/python-modules/stripe { };

     

       8884
       8884
       +
       

     

       8885
       8885
       +
         striprtf = callPackage ../development/python-modules/striprtf { };

     

       8882
       8886
        
       

     

       8883
       8887
        
         structlog = callPackage ../development/python-modules/structlog { };

     

       8884
       8888